From cfeb6aca6d8decbf7461992059cf1d6b13477a4e Mon Sep 17 00:00:00 2001 From: Gregory PLANCHAT Date: Thu, 22 Sep 2011 01:19:45 +0200 Subject: [PATCH] Fixed mysql_* calls Updated skin Fixed minor bugs in shipyard pages display Fixed various bugs in legacy fleet pages source code. Signed-off-by: Gregory PLANCHAT --- admin/ElementQueueFixer.php | 2 +- admin/QueryExecute.php | 2 +- admin/ShowFlyingFleets.php | 2 +- admin/XNovaResetUnivers.php | 2 +- admin/activeplanet.php | 2 +- admin/add_fleet.php | 2 +- admin/add_money.php | 2 +- admin/add_moon.php | 2 +- admin/autounban.php | 2 +- admin/banned.php | 2 +- admin/changelog.php | 2 +- admin/chat.php | 2 +- admin/credit.php | 2 +- admin/declare_list.php | 4 +- admin/deletuser.php | 2 +- admin/errors.php | 2 +- admin/leftmenu.php | 2 +- admin/mass_message.php | 2 +- admin/md5changepass.php | 2 +- admin/md5enc.php | 2 +- admin/messagelist.php | 2 +- admin/messall.php | 2 +- admin/moonlist.php | 2 +- admin/multi.php | 2 +- admin/overview.php | 4 +- admin/paneladmina.php | 84 +- admin/planetlist.php | 2 +- admin/settings.php | 2 +- admin/statfunctions.php | 2 +- admin/unbanned.php | 2 +- admin/userlist.php | 2 +- admin/variables.php | 2 +- buddy.php | 2 +- buildings.php | 6 +- contact.php | 2 +- fleet.php | 474 +++++----- floten1.php | 514 +++++----- floten2.php | 493 +++++----- floten3.php | 874 +++++++++--------- galaxy.php | 2 +- includes/application/code/core/Legacies.php | 16 + .../code/core/Legacies/Core/Collection.php | 25 +- .../code/core/Legacies/Core/View.php | 13 +- .../Empire/Block/Planet/Shipyard/Queue.php | 2 +- .../core/Legacies/Empire/Model/Planet.php | 50 + .../Legacies/Empire/Model/Planet/Builder.php | 8 +- .../code/core/Legacies/Empire/Model/User.php | 4 +- .../design/scripts/empire/topnav.phtml | 10 +- includes/constants.php | 2 + includes/debug.class.php | 31 +- includes/functions/BuildFlyingFleetTable.php | 2 +- includes/functions/DeleteSelectedUser.php | 2 +- .../functions/MissionCaseColonisation.php | 6 +- includes/unlocalised.php | 27 +- install/index.php | 2 +- overview.php | 6 +- phalanx.php | 2 +- rak.php | 12 +- raketenangriff.php | 2 +- reg.php | 3 +- scripts/flotten.js | 34 +- search.php | 2 +- skin/default/css/deprecated/about.css | 2 +- skin/default/css/deprecated/default.css | 28 - skin/default/css/deprecated/formate.css | 92 +- skin/default/css/deprecated/styles.css | 2 +- skin/default/css/legacies.css | 25 +- verband.php | 5 +- 68 files changed, 1521 insertions(+), 1411 deletions(-) diff --git a/admin/ElementQueueFixer.php b/admin/ElementQueueFixer.php index 4411b89..b6bdd95 100644 --- a/admin/ElementQueueFixer.php +++ b/admin/ElementQueueFixer.php @@ -1,6 +1,6 @@ fetch(PDO::FETCH_ASSOC) ) { if ($PrevIP != "") { if ($PrevIP == $u['declarator']) { $Color = "red"; diff --git a/admin/deletuser.php b/admin/deletuser.php index 5bbfecd..c2fd953 100644 --- a/admin/deletuser.php +++ b/admin/deletuser.php @@ -1,6 +1,6 @@ = '". (time() - 15 * 60) ."' ORDER BY `". $TypeSort ."` ASC;", 'users'); $Count = 0; $Color = "lime"; - while ( $TheUser = mysql_fetch_array($Last15Mins) ) { + while ($TheUser = $Last15Mins->fetch(PDO::FETCH_ASSOC) ) { if ($PrevIP != "") { if ($PrevIP == $TheUser['user_lastip']) { $Color = "red"; diff --git a/admin/paneladmina.php b/admin/paneladmina.php index 86793a2..459411c 100644 --- a/admin/paneladmina.php +++ b/admin/paneladmina.php @@ -1,6 +1,6 @@ quote('%' . str_replace('*', '%', str_replace('%', '%%', $_GET['player'])) . '%')}" +SQL_EOF; + $statement = $db->prepare($sql); + $statement->execute(); + $data = $statement->fetch(PDO::FETCH_ASSOC); $bloc = $lang; - $bloc['answer1'] = $SelUser['id']; - $bloc['answer2'] = $SelUser['username']; - $bloc['answer3'] = $SelUser['user_lastip']; - $bloc['answer4'] = $SelUser['email']; - $bloc['answer5'] = $lang['adm_usr_level'][ $SelUser['authlevel'] ]; - $bloc['answer6'] = $lang['adm_usr_genre'][ $SelUser['sex'] ]; - $bloc['answer7'] = "[".$SelUser['id_planet']."] ".$UsrMain['name']; - $bloc['answer8'] = "[".$SelUser['galaxy'].":".$SelUser['system'].":".$SelUser['planet']."] "; + $bloc['answer1'] = $data['user_id']; + $bloc['answer2'] = $data['username']; + $bloc['answer3'] = $data['user_lastip']; + $bloc['answer4'] = $data['email']; + $bloc['answer5'] = $lang['adm_usr_level'][$data['authlevel']]; + $bloc['answer6'] = $lang['adm_usr_genre'][$data['sex']]; + $bloc['answer7'] = "[".$data['planet_id']."] {$data['planet_name']}"; + $bloc['answer8'] = "[".$SelUser['planet_galaxy'].":".$SelUser['planet_system'].":".$SelUser['planet_position']."] "; $SubPanelTPL = gettemplate('admin/admin_panel_asw1'); - $parse['adm_sub_form2'] = parsetemplate( $SubPanelTPL, $bloc ); + $parse['adm_sub_form2'] = parsetemplate($SubPanelTPL, $bloc); break; case 'usr_data': + $db = Legacies_Database::getSingleton(); + $sql =<<quote('%' . str_replace('*', '%', str_replace('%', '%%', $_GET['player'])) . '%')}" +SQL_EOF; + $statement = $db->prepare($sql); + $statement->execute(); + $data = $statement->fetch(PDO::FETCH_ASSOC); + $pattern = mysql_real_escape_string($_GET['player']); $SelUser = doquery("SELECT * FROM {{table}} WHERE `username` LIKE '%". $pattern ."%' LIMIT 1;", 'users', true); $UsrMain = doquery("SELECT `name` FROM {{table}} WHERE `id` = '". $SelUser['id_planet'] ."';", 'planets', true); $bloc = $lang; - $bloc['answer1'] = $SelUser['id']; - $bloc['answer2'] = $SelUser['username']; - $bloc['answer3'] = $SelUser['user_lastip']; - $bloc['answer4'] = $SelUser['email']; - $bloc['answer5'] = $lang['adm_usr_level'][ $SelUser['authlevel'] ]; - $bloc['answer6'] = $lang['adm_usr_genre'][ $SelUser['sex'] ]; - $bloc['answer7'] = "[".$SelUser['id_planet']."] ".$UsrMain['name']; - $bloc['answer8'] = "[".$SelUser['galaxy'].":".$SelUser['system'].":".$SelUser['planet']."] "; + $bloc['answer1'] = $data['user_id']; + $bloc['answer2'] = $data['username']; + $bloc['answer3'] = $data['user_lastip']; + $bloc['answer4'] = $data['email']; + $bloc['answer5'] = $lang['adm_usr_level'][$data['authlevel']]; + $bloc['answer6'] = $lang['adm_usr_genre'][$data['sex']]; + $bloc['answer7'] = "[".$data['planet_id']."] {$data['planet_name']}"; + $bloc['answer8'] = "[".$SelUser['planet_galaxy'].":".$SelUser['planet_system'].":".$SelUser['planet_position']."] "; $SubPanelTPL = gettemplate('admin/admin_panel_asw1'); $parse['adm_sub_form1'] = parsetemplate( $SubPanelTPL, $bloc ); diff --git a/admin/planetlist.php b/admin/planetlist.php index 954600c..27213b0 100644 --- a/admin/planetlist.php +++ b/admin/planetlist.php @@ -1,6 +1,6 @@ fetch(PDO::FETCH_BOTH) ) { // para solicitudes if ( !isset( $i ) && isset( $a ) ) { $page .= " diff --git a/buildings.php b/buildings.php index ac51962..195e250 100644 --- a/buildings.php +++ b/buildings.php @@ -40,7 +40,7 @@ $mode = isset($_GET['mode']) ? $_GET['mode'] : null; switch ($mode) { case 'fleet': - if ($planet->getElement(Legacies_Empire::ID_BUILDING_SHIPYARD) === null) { + if ($planet->getElement(Legacies_Empire::ID_BUILDING_SHIPYARD) < 1) { $layout = new Legacies_Core_Layout(); $layout->load('message'); @@ -71,7 +71,7 @@ case 'fleet': break; case 'research': - if ($planet->getElement(Legacies_Empire::ID_BUILDING_RESEARCH_LAB) === null) { + if ($planet->getElement(Legacies_Empire::ID_BUILDING_RESEARCH_LAB) < 1) { $layout = new Legacies_Core_Layout(); $layout->load('message'); @@ -99,7 +99,7 @@ case 'research': break; case 'defense': - if ($planet->getElement(Legacies_Empire::ID_BUILDING_SHIPYARD) === null) { + if ($planet->getElement(Legacies_Empire::ID_BUILDING_SHIPYARD) < 1) { $layout = new Legacies_Core_Layout(); $layout->load('message'); diff --git a/contact.php b/contact.php index 3f0ed16..83e76c1 100644 --- a/contact.php +++ b/contact.php @@ -44,7 +44,7 @@ require_once dirname(__FILE__) .'/common.php'; $QrySelectUser .= "WHERE `authlevel` != '0' ORDER BY `authlevel` DESC;"; $GameOps = doquery ( $QrySelectUser, 'users'); - while( $Ops = mysql_fetch_assoc($GameOps) ) { + while( $Ops = $GameOps->fetch(PDO::FETCH_ASSOC) ) { $bloc['ctc_data_name'] = $Ops['username']; $bloc['ctc_data_auth'] = $lang['user_level'][$Ops['authlevel']]; $bloc['ctc_data_mail'] = "".$Ops['email'].""; diff --git a/fleet.php b/fleet.php index 795f54d..652261d 100644 --- a/fleet.php +++ b/fleet.php @@ -32,254 +32,256 @@ define('INSIDE' , true); define('INSTALL' , false); require_once dirname(__FILE__) .'/common.php'; - $maxfleet = doquery("SELECT COUNT(fleet_owner) AS `actcnt` FROM {{table}} WHERE `fleet_owner` = '".$user['id']."';", 'fleets', true); +$maxfleet = doquery("SELECT 1 FROM {{table}} WHERE `fleet_owner` = '".$user['id']."';", 'fleets'); - $MaxFlyingFleets = $maxfleet['actcnt']; +$MaxFlyingFleets = $maxfleet->rowCount(); +$maxfleet->closeCursor(); - //Compteur de flotte en expéditions et nombre d'expédition maximum - $MaxExpedition = $user[$resource[124]]; - if ($MaxExpedition >= 1) { - $maxexpde = doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{table}} WHERE `fleet_owner` = '".$user['id']."' AND `fleet_mission` = '15';", 'fleets', true); - $ExpeditionEnCours = $maxexpde['expedi']; - $EnvoiMaxExpedition = 1 + floor( $MaxExpedition / 3 ); +//Compteur de flotte en expéditions et nombre d'expédition maximum +$maxExpedition = $user->getElement(Legacies_Empire::ID_RESEARCH_EXPEDITION_TECHNOLOGY); +$ExpeditionEnCours = 0; +$EnvoiMaxExpedition = 0; +if ($maxExpedition >= 1) { + $maxexpde = doquery("SELECT 1 FROM {{table}} WHERE `fleet_owner` = '".$user['id']."' AND `fleet_mission` = '15';", 'fleets'); + $ExpeditionEnCours = $maxexpde->rowCount(); + $maxexpde->closeCursor(); + + $EnvoiMaxExpedition = 1 + floor($maxExpedition / 3); +} + +$MaxFlottes = 1 + $user->getElement(Legacies_Empire::ID_RESEARCH_COMPUTER_TECHNOLOGY); + +includeLang('fleet'); + +$missionTypes = array( + Legacies_Empire::ID_MISSION_ATTACK => $lang['type_mission'][Legacies_Empire::ID_MISSION_ATTACK], + Legacies_Empire::ID_MISSION_GROUP_ATTACK => $lang['type_mission'][Legacies_Empire::ID_MISSION_GROUP_ATTACK], + Legacies_Empire::ID_MISSION_TRANSPORT => $lang['type_mission'][Legacies_Empire::ID_MISSION_TRANSPORT], + Legacies_Empire::ID_MISSION_STATION => $lang['type_mission'][Legacies_Empire::ID_MISSION_STATION], + Legacies_Empire::ID_MISSION_STATION_ALLY => $lang['type_mission'][Legacies_Empire::ID_MISSION_STATION_ALLY], + Legacies_Empire::ID_MISSION_SPY => $lang['type_mission'][Legacies_Empire::ID_MISSION_SPY], + Legacies_Empire::ID_MISSION_SETTLE_COLONY => $lang['type_mission'][Legacies_Empire::ID_MISSION_SETTLE_COLONY], + Legacies_Empire::ID_MISSION_RECYCLE => $lang['type_mission'][Legacies_Empire::ID_MISSION_RECYCLE], + Legacies_Empire::ID_MISSION_DESTROY => $lang['type_mission'][Legacies_Empire::ID_MISSION_DESTROY], + Legacies_Empire::ID_MISSION_EXPEDITION => $lang['type_mission'][Legacies_Empire::ID_MISSION_EXPEDITION] +); + +// Histoire de recuperer les infos passées par galaxy +$galaxy = isset($_GET['galaxy']) ? intval($_GET['galaxy']) : 0; +$system = isset($_GET['system']) ? intval($_GET['system']) : 0; +$position = isset($_GET['planet']) ? intval($_GET['planet']) : 0; +$planetType = isset($_GET['planettype']) ? intval($_GET['planettype']) : 0; +$targetMission = isset($_GET['target_mission']) ? intval($_GET['target_mission']) : 0; + +$user = Legacies_Empire_Model_User::getSingleton(); +$planet = $user->getCurrentPlanet(); + +if ($galaxy <= 0 || $galaxy > MAX_GALAXY_IN_WORLD) { + $galaxy = $planet['galaxy']; +} +if ($system <= 0 || $system > MAX_SYSTEM_IN_GALAXY) { + $system = $planet['system']; +} +if ($position <= 0 || $position > MAX_PLANET_IN_SYSTEM) { + $position = $planet['planet']; +} + +$allowedPlanetTypes = array( + Legacies_Empire_Model_Planet::TYPE_PLANET, + Legacies_Empire_Model_Planet::TYPE_DEBRIS, + Legacies_Empire_Model_Planet::TYPE_MOON + ); + +if (!in_array($planetType, $allowedPlanetTypes)) { + $planetType = $planet['planet_type']; +} + +$page = "\n"; +$page .= "\n"; +$page .= "
"; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +//$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; + +$i = 0; +foreach ($user->getFleetCollection() as $f) { + $i++; + $page .= ""; + // (01) Fleet ID + $page .= ""; + // (02) Fleet Mission + $page .= ""; + // (03) Fleet Mission + $page .= ""; + // (04) Fleet From (Planete d'origine) + $page .= ""; + // (05) Fleet Start Time + $page .= ""; + // (06) Fleet Target (Planete de destination) + $page .= ""; + // (07) Fleet Target Time + $page .= ""; + // (08) Fleet Back Time +// $page .= ""; + // (09) Fleet Back In + $page .= ""; + // (10) Orders + $page .= ""; + // Fin de ligne + $page .= ""; +} - $MaxFlottes = 1 + $user[$resource[108]]; + // Y a pas de flottes en vol ... on met des '-' +if ($i == 0) { + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; +// $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; +} - CheckPlanetUsedFields($planetrow); +if ($MaxFlottes == $MaxFlyingFleets) { + $page .= ""; +} - includeLang('fleet'); +$page .= "
"; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= "
"; +$page .= $lang['fl_title']." ".$MaxFlyingFleets." ".$lang['fl_sur']." ".$MaxFlottes; +$page .= ""; +$page .= $ExpeditionEnCours."/".$EnvoiMaxExpedition." ".$lang['fl_expttl']; +$page .= "
"; +$page .= "
".$lang['fl_id']."".$lang['fl_mission']."".$lang['fl_count']."".$lang['fl_from']."".$lang['fl_start_t']."".$lang['fl_dest']."".$lang['fl_dest_t']."".$lang['fl_back_t']."".$lang['fl_back_in']."".$lang['fl_order']."
".$i.""; + $page .= "". $missionTypes[$f['fleet_mission']] .""; + if (($f['fleet_start_time'] + 1) == $f['fleet_end_time']) { + $page .= "
".$lang['fl_back_to'].""; + } else { + $page .= "
".$lang['fl_get_to'].""; } + $page .= "		 $b) { + if ($b != '') { + $e++; + $a = explode(",", $b); + $page .= $lang['tech'][$a[0]]. ":". $a[1] ."\n"; + if ($e > 1) { + $page .= "\t"; + } + } + } + $page .= "\">". pretty_number($f['fleet_amount']) ."[".$f[fleet_start_galaxy].":".$f['fleet_start_system'].":".$f['fleet_start_planet']."]". gmdate("d. M Y H:i:s", $f['fleet_start_time']) ."[".$f['fleet_end_galaxy'].":".$f['fleet_end_system'].":".$f['fleet_end_planet']."]". gmdate("d. M Y H:i:s", $f['fleet_end_time']) ."
". pretty_time(floor($f['fleet_end_time'] + 1 - time())) ."
". pretty_time(floor($f['fleet_end_time'] + 1 - time())) ."
"; + if ($f['fleet_mess'] == 0) { + $page .= "
"; + $page .= ""; + $page .= ""; + $page .= "
"; + if ($f[fleet_mission] == 1) { + $page .= "
"; + $page .= ""; + $page .= ""; + $page .= "
"; + } + } else { + $page .= " - "; + } + $page .= "
----------
".$lang['fl_noslotfree']."
"; - $missiontype = array( - 1 => $lang['type_mission'][1], - 2 => $lang['type_mission'][2], - 3 => $lang['type_mission'][3], - 4 => $lang['type_mission'][4], - 5 => $lang['type_mission'][5], - 6 => $lang['type_mission'][6], - 7 => $lang['type_mission'][7], - 8 => $lang['type_mission'][8], - 9 => $lang['type_mission'][9], - 15 => $lang['type_mission'][15] - ); +$page .= "
"; - // Histoire de recuperer les infos passées par galaxy - $galaxy = $_GET['galaxy']; - $system = $_GET['system']; - $planet = $_GET['planet']; - $planettype = $_GET['planettype']; - $target_mission = $_GET['target_mission']; +// Selection d'une nouvelle mission +$page .= "
"; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; - if (!$galaxy) { - $galaxy = $planetrow['galaxy']; - } - if (!$system) { - $system = $planetrow['system']; - } - if (!$planet) { - $planet = $planetrow['planet']; - } - if (!$planettype) { - $planettype = $planetrow['planet_type']; - } +if (!$planet) { + message($lang['fl_noplanetrow'], $lang['fl_error']); +} - $page = "\n"; - $page .= "\n"; - $page .= "
"; - $page .= "
".$lang['fl_new_miss']."
".$lang['fl_fleet_typ']."".$lang['fl_fleet_disp']."--
"; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; -// $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; +$ShipData = ""; - // Gestion des flottes du joueur actif - $fq = doquery("SELECT * FROM {{table}} WHERE fleet_owner={$user[id]}", "fleets"); - $i = 0; +foreach ($reslist['fleet'] as $n => $i) { + if ($planet[$resource[$i]] > 0) { + $page .= ""; + $page .= ""; + $page .= ""; + // Satelitte Solaire (eux ne peuvent pas bouger !) + if ($i == 212) { + $page .= ""; + } else { + $page .= ""; + $page .= ""; + } + $page .= ""; + } + $have_ships = true; +} +$btncontinue = ""; +$page .= ""; +if (!$have_ships) { + // Il n'y a pas de vaisseaux sur cette planete + $page .= ""; + $page .= ""; + $page .= $btncontinue; +} else { + $page .= ""; + $page .= ""; + $page .= ""; - while ($f = $fq->fetch(PDO::FETCH_BOTH)) { - $i++; - $page .= ""; - // (01) Fleet ID - $page .= ""; - // (02) Fleet Mission - $page .= ""; - // (03) Fleet Mission - $page .= ""; - // (04) Fleet From (Planete d'origine) - $page .= ""; - // (05) Fleet Start Time - $page .= ""; - // (06) Fleet Target (Planete de destination) - $page .= ""; - // (07) Fleet Target Time - $page .= ""; - // (08) Fleet Back Time -// $page .= ""; - // (09) Fleet Back In - $page .= ""; - // (10) Orders - $page .= ""; - // Fin de ligne - $page .= ""; - } + if ($MaxFlottes > $MaxFlyingFleets) { + $page .= $btncontinue; + } +} +$page .= ""; +$page .= "
"; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= "
"; - $page .= $lang['fl_title']." ".$MaxFlyingFleets." ".$lang['fl_sur']." ".$MaxFlottes; - $page .= ""; - $page .= $ExpeditionEnCours."/".$EnvoiMaxExpedition." ".$lang['fl_expttl']; - $page .= "
"; - $page .= "
".$lang['fl_id']."".$lang['fl_mission']."".$lang['fl_count']."".$lang['fl_from']."".$lang['fl_start_t']."".$lang['fl_dest']."".$lang['fl_dest_t']."".$lang['fl_back_t']."".$lang['fl_back_in']."".$lang['fl_order']."
" . $lang['tech'][$i] . "". pretty_number ($planet[$resource[$i]]); + $ShipData .= ""; + $ShipData .= ""; + $ShipData .= ""; + $ShipData .= ""; + $page .= "".$lang['fl_selmax']."
". $lang['fl_noships'] ."
". $lang['fl_unselectall'] ."". $lang['fl_selectall'] ."
".$i.""; - $page .= "". $missiontype[$f[fleet_mission]] .""; - if (($f['fleet_start_time'] + 1) == $f['fleet_end_time']) { - $page .= "
".$lang['fl_back_to'].""; - } else { - $page .= "
".$lang['fl_get_to'].""; - } - $page .= "		 $b) { - if ($b != '') { - $e++; - $a = explode(",", $b); - $page .= $lang['tech'][$a[0]]. ":". $a[1] ."\n"; - if ($e > 1) { - $page .= "\t"; - } - } - } - $page .= "\">". pretty_number($f[fleet_amount]) ."[".$f[fleet_start_galaxy].":".$f[fleet_start_system].":".$f[fleet_start_planet]."]". gmdate("d. M Y H:i:s", $f['fleet_start_time']) ."[".$f[fleet_end_galaxy].":".$f[fleet_end_system].":".$f[fleet_end_planet]."]". gmdate("d. M Y H:i:s", $f['fleet_end_time']) ."
". pretty_time(floor($f['fleet_end_time'] + 1 - time())) ."
". pretty_time(floor($f['fleet_end_time'] + 1 - time())) ."
"; - if ($f['fleet_mess'] == 0) { - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - if ($f[fleet_mission] == 1) { - $page .= "
"; - $page .= ""; - $page .= ""; - $page .= "
"; - } - } else { - $page .= " - "; - } - $page .= "
"; +$page .= $ShipData; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= "
"; - // Y a pas de flottes en vol ... on met des '-' - if ($i == 0) { - $page .= ""; - $page .= "-"; - $page .= "-"; - $page .= "-"; - $page .= "-"; - $page .= "-"; - $page .= "-"; - $page .= "-"; -// $page .= "-"; - $page .= "-"; - $page .= "-"; - $page .= ""; - } +display($page, $lang['fl_title']); - if ($MaxFlottes == $MaxFlyingFleets) { - $page .= "".$lang['fl_noslotfree'].""; - } - - $page .= ""; - - $page .= "
"; - - // Selection d'une nouvelle mission - $page .= "
"; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - - if (!$planetrow) { - message($lang['fl_noplanetrow'], $lang['fl_error']); - } - - // Prise des coordonnées sur la ligne de commande - $galaxy = intval($_GET['galaxy']); - $system = intval($_GET['system']); - $planet = intval($_GET['planet']); - $planettype = intval($_GET['planettype']); - $target_mission = intval($_GET['target_mission']); - $ShipData = ""; - - foreach ($reslist['fleet'] as $n => $i) { - if ($planetrow[$resource[$i]] > 0) { - $page .= ""; - $page .= ""; - $page .= ""; - // Satelitte Solaire (eux ne peuvent pas bouger !) - if ($i == 212) { - $page .= ""; - } else { - $page .= ""; - $page .= ""; - } - $page .= ""; - } - $have_ships = true; - } - - $btncontinue = ""; - $page .= ""; - if (!$have_ships) { - // Il n'y a pas de vaisseaux sur cette planete - $page .= ""; - $page .= ""; - $page .= $btncontinue; - } else { - $page .= ""; - $page .= ""; - $page .= ""; - - if ($MaxFlottes > $MaxFlyingFleets) { - $page .= $btncontinue; - } - } - $page .= ""; - $page .= "
".$lang['fl_new_miss']."
".$lang['fl_fleet_typ']."".$lang['fl_fleet_disp']."--
" . $lang['tech'][$i] . "". pretty_number ($planetrow[$resource[$i]]); - $ShipData .= ""; - $ShipData .= ""; - $ShipData .= ""; - $ShipData .= ""; - $page .= "".$lang['fl_selmax']."
". $lang['fl_noships'] ."
". $lang['fl_unselectall'] ."". $lang['fl_selectall'] ."
"; - $page .= $ShipData; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= "
"; - $page .= "
"; - - display($page, $lang['fl_title']); - -?> diff --git a/floten1.php b/floten1.php index 4a61f06..1b693cf 100644 --- a/floten1.php +++ b/floten1.php @@ -1,6 +1,6 @@ 100, - 9 => 90, - 8 => 80, - 7 => 70, - 6 => 60, - 5 => 50, - 4 => 40, - 3 => 30, - 2 => 20, - 1 => 10, - ); +$speed = array(10 => 100, + 9 => 90, + 8 => 80, + 7 => 70, + 6 => 60, + 5 => 50, + 4 => 40, + 3 => 30, + 2 => 20, + 1 => 10, + ); - $g = $_POST['galaxy']; - $s = $_POST['system']; - $p = $_POST['planet']; - $t = $_POST['planet_type']; +$user = Legacies_Empire_Model_User::getSingleton(); +$planetrow = $user->getCurrentPlanet(); - if (!$g) { - $g = $planetrow['galaxy']; - } - if (!$s) { - $s = $planetrow['system']; - } - if (!$p) { - $p = $planetrow['planet']; - } - if (!$t) { - $t = $planetrow['planet_type']; - } +$g = isset($_POST['galaxy']) ? intval($_POST['galaxy']) : 0; +$s = isset($_POST['system']) ? intval($_POST['system']) : 0; +$p = isset($_POST['planet']) ? intval($_POST['planet']) : 0; +$t = isset($_POST['planet_type']) ? intval($_POST['planet_type']) : 0; - // Verifions si nous avons bien tout ce que nous voullons envoyer - $FleetHiddenBlock = ""; - foreach ($reslist['fleet'] as $n => $i) { - if ($i > 200 && $i < 300 && $_POST["ship$i"] > "0") { - if ($_POST["ship$i"] > $planetrow[$resource[$i]]) { - $page .= $lang['fl_noenought']; - $speedalls[$i] = GetFleetMaxSpeed ( "", $i, $user ); - } else { - $fleet['fleetarray'][$i] = $_POST["ship$i"]; - // Tableau des vaisseaux avec leur nombre - $fleet['fleetlist'] .= $i . "," . $_POST["ship$i"] . ";"; - // Nombre total de vaisseaux - $fleet['amount'] += $_POST["ship$i"]; - // Tableau des vitesses - $FleetHiddenBlock .= ""; - $FleetHiddenBlock .= ""; - $FleetHiddenBlock .= ""; - $FleetHiddenBlock .= ""; - $speedalls[$i] = GetFleetMaxSpeed ( "", $i, $user ); - } - } - } +if ($g <= 0 || $g > MAX_GALAXY_IN_WORLD) { + $g = $planetrow['galaxy']; +} +if ($s <= 0 || $s > MAX_SYSTEM_IN_GALAXY) { + $s = $planetrow['system']; +} +if ($p <= 0 || $p > MAX_PLANET_IN_SYSTEM) { + $p = $planetrow['planet']; +} +$allowedPlanetTypes = array( + Legacies_Empire_Model_Planet::TYPE_PLANET, + Legacies_Empire_Model_Planet::TYPE_DEBRIS, + Legacies_Empire_Model_Planet::TYPE_MOON + ); - if (!$fleet['fleetlist']) { - message($lang['fl_unselectall'], $lang['fl_error'], "fleet." . PHPEXT, 1); - } else { - $speedallsmin = min($speedalls); - } - $page .= ""; - $page .= "\n"; - $page .= "
"; - $page .= $FleetHiddenBlock; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; +if (!in_array($t, $allowedPlanetTypes)) { + $t = $planet['planet_type']; +} - $page .= "
"; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; +$session = Legacies::getSession('fleet'); +$session->clearData(); +$FleetHiddenBlock = ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; +$fleetArray = array(); +$speedArray = array(); +$consumptionArray = array(); +$capacityArray = array(); +if (isset($_POST['ship']) && is_array($_POST['ship'])) { + $selectedShips = $_POST['ship']; +} +foreach ($reslist[Legacies_Empire::TYPE_SHIP] as $shipId) { + if (!isset($selectedShips[$shipId])) { + continue; + } + + $qty = intval($selectedShips[$shipId]); + if ($qty <= 0) { + continue; + } + + if ($qty > $planetrow->getElement($shipId)) { + $page .= $lang['fl_noenought']; + $speedalls[$shipId] = GetFleetMaxSpeed("", $shipId, $user); + } else { + $fleetArray[$shipId] = $qty; + $session['qty'] += $qty; + $speedArray[$shipId] = GetFleetMaxSpeed("", $shipId, $user); + $consumptionArray[$shipId] = GetShipConsumption($shipId, $user); + $capacityArray[$shipId] = $pricelist[$shipId]['capacity']; + + // Tableau des vitesses + $FleetHiddenBlock .= ""; + $FleetHiddenBlock .= ""; + $FleetHiddenBlock .= ""; + $FleetHiddenBlock .= ""; + $speedalls[$shipId] = GetFleetMaxSpeed("", $shipId, $user); + } +} +unset($selectedShips); + +$session['fleet'] = $fleetArray; +$session['speed'] = $speedArray; +$session['consumption'] = $consumptionArray; +$session['capacity'] = $capacityArray; + +if (empty($fleetArray)) { + message($lang['fl_unselectall'], $lang['fl_error'], "fleet." . PHPEXT, 1); +} else { + $speedallsmin = min($speedalls); +} + +$speedFactor = GetGameSpeedFactor(); +$session['speedallsmin'] = $speedallsmin; + +$scriptPath = Legacies::getUrl('scripts/flotten.js'); +$page .= ""; +$page .= "\n"; +$page .= ""; +$page .= $FleetHiddenBlock; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; + +$page .= "
"; +$page .= "
". $lang['fl_floten1_ttl'] ."
". $lang['fl_dest'] .""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= "
". $lang['fl_speed'] .""; - $page .= " %"; - $page .= "
". $lang['fl_dist'] ."
-
". $lang['fl_fltime'] ."
-
"; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; + +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; /* A faire assez rapidement (faut juste savoir comment) - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; */ - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; - // Gestion des raccourcis sur la galaxie - $page .= ""; - $page .= ""; - $page .= ""; - if ($user['fleet_shortcut']) { - $scarray = explode("\r\n", $user['fleet_shortcut']); - $i = 0; - foreach ($scarray as $a => $b) { - if ($b != "") { - $c = explode(',', $b); - if ($i == 0) { - $page .= ""; - } - $page .= ""; - $page .= ""; - } +// Gestion des raccourcis sur la galaxie +$page .= ""; +$page .= ""; +$page .= ""; +if ($user['fleet_shortcut']) { + $scarray = explode("\r\n", $user['fleet_shortcut']); + $i = 0; + foreach ($scarray as $a => $b) { + if ($b != "") { + $c = explode(',', $b); + if ($i == 0) { + $page .= ""; + } + $page .= ""; + $page .= ""; +} - $page .= ""; - $page .= ""; - $page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; - // Gestion des raccourcis vers ses propres colonies ou planetes - $kolonien = SortUserPlanets ( $user ); - $currentplanet = doquery("SELECT * FROM {{table}} WHERE id = '" . $user['current_planet'] . "'", 'planets', true); +// Gestion des raccourcis vers ses propres colonies ou planetes +$kolonien = SortUserPlanets ( $user ); +$currentplanet = doquery("SELECT * FROM {{table}} WHERE id = '" . $user['current_planet'] . "'", 'planets', true); - if (mysql_num_rows($kolonien) > 1) { - $i = 0; - $w = 0; - $tr = true; - while ($row = $kolonien->fetch(PDO::FETCH_BOTH)) { - if ($w == 0 && $tr) { - $page .= ""; - $tr = false; - } - if ($w == 2) { - $page .= ""; - $w = 0; - $tr = true; - } +if ($kolonien->rowCount() > 1) { + $i = 0; + $w = 0; + $tr = true; + while ($row = $kolonien->fetch(PDO::FETCH_BOTH)) { + if ($w == 0 && $tr) { + $page .= ""; + $tr = false; + } + if ($w == 2) { + $page .= ""; + $w = 0; + $tr = true; + } - if ($row['planet_type'] == 3) { - $row['name'] .= " ". $lang['fl_shrtcup3']; - } + if ($row['planet_type'] == 3) { + $row['name'] .= " ". $lang['fl_shrtcup3']; + } - if ($currentplanet['galaxy'] == $row['galaxy'] && - $currentplanet['system'] == $row['system'] && - $currentplanet['planet'] == $row['planet'] && - $currentplanet['planet_type'] == $row['planet_type'] ) { -// $page .= ''; - } else { - $page .= ""; - $w++; - $i++; - } - } + if ($currentplanet['galaxy'] == $row['galaxy'] && + $currentplanet['system'] == $row['system'] && + $currentplanet['planet'] == $row['planet'] && + $currentplanet['planet_type'] == $row['planet_type'] ) { +// $page .= ''; + } else { + $page .= ""; + $w++; + $i++; + } + } - if ($i % 2 != 0) { - $page .= ""; - } elseif ($w == 2) { - $page .= ""; - } - } else { - $page .= ""; - } + if ($i % 2 != 0) { + $page .= ""; + } elseif ($w == 2) { + $page .= ""; + } +} else { + $page .= ""; +} - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= "
". $lang['fl_floten1_ttl'] ."
". $lang['fl_dest'] .""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= "
". $lang['fl_speed'] .""; +$page .= " %"; +$page .= "
". $lang['fl_dist'] ."
-
". $lang['fl_fltime'] ."
-
". $lang['fl_time_go'] ."
". gmdate("H:i:s") ."
". $lang['fl_time_back'] ."
". gmdate("H:i:s") ."
". $lang['fl_time_go'] ."
". gmdate("H:i:s") ."
". $lang['fl_time_back'] ."
". gmdate("H:i:s") ."
". $lang['fl_deute_need'] ."
-
". $lang['fl_speed_max'] ."
-
". $lang['fl_max_load'] ."
-
". $lang['fl_deute_need'] ."
-
". $lang['fl_speed_max'] ."
-
". $lang['fl_max_load'] ."
-
". $lang['fl_shortcut'] ." ". $lang['fl_shortlnk'] ."
"; - $page .= "". $lang['fl_noshortc'] ."
". $lang['fl_shortcut'] ." ". $lang['fl_shortlnk'] ."
"; + $page .= "". $lang['fl_noshortc'] ."
". $lang['fl_myplanets'] ."
". $lang['fl_myplanets'] ."
'.$row['name'].' '.$row['galaxy'].':'.$row['system'].':'.$row['planet'].'". $row['name'] ." ". $row['galaxy'] .":". $row['system'] .":". $row['planet'] ."'.$row['name'].' '.$row['galaxy'].':'.$row['system'].':'.$row['planet'].'". $row['name'] ." ". $row['galaxy'] .":". $row['system'] .":". $row['planet'] ." 
". $lang['fl_nocolonies'] ." 
". $lang['fl_nocolonies'] ."
". $lang['fl_grattack'] ."
-
"; - $page .= "
"; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= "
"; - $page .= ""; +$page .= ""; +$page .= ""; +$page .= "". $lang['fl_grattack'] .""; +$page .= ""; +$page .= ""; +$page .= "-"; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; - display($page, $lang['fl_title']); +$maxExpedition = $user->getElement(Legacies_Empire::ID_RESEARCH_EXPEDITION_TECHNOLOGY); +$ExpeditionEnCours = 0; +$EnvoiMaxExpedition = 0; +if ($maxExpedition >= 1) { + $maxexpde = doquery("SELECT 1 FROM {{table}} WHERE `fleet_owner` = '".$user['id']."' AND `fleet_mission` = '15';", 'fleets'); + $ExpeditionEnCours = $maxexpde->rowCount(); + $maxexpde->closeCursor(); + + $EnvoiMaxExpedition = 1 + floor($maxExpedition / 3); +} +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; +$page .= ""; + +display($page, $lang['fl_title']); -// Updated by Chlorel. 16 Jan 2008 (String extraction, bug corrections, code uniformisation -// Created by Perberos. All rights reversed (C) 2006 -?> diff --git a/floten2.php b/floten2.php index a56178b..522e6f9 100644 --- a/floten2.php +++ b/floten2.php @@ -31,251 +31,280 @@ define('INSIDE' , true); define('INSTALL' , false); require_once dirname(__FILE__) .'/common.php'; - includeLang('fleet'); +includeLang('fleet'); - $galaxy = intval($_POST['galaxy']); - $system = intval($_POST['system']); - $planet = intval($_POST['planet']); - $planettype = intval($_POST['planettype']); +$session = Legacies::getSession('fleet'); - // Test d'existance et de proprieté de la planete - $YourPlanet = false; - $UsedPlanet = false; - $select = doquery("SELECT * FROM {{table}}", "planets"); +$galaxy = isset($_POST['galaxy']) ? intval($_POST['galaxy']) : 0; +$system = isset($_POST['system']) ? intval($_POST['system']) : 0; +$planet = isset($_POST['planet']) ? intval($_POST['planet']) : 0; +$planettype = isset($_POST['planettype']) ? intval($_POST['planettype']) : 0; +$speed = isset($_POST['speed']) ? intval($_POST['speed']) : 10; - while ($row = $select->fetch(PDO::FETCH_BOTH)) { - if ($galaxy == $row['galaxy'] && - $system == $row['system'] && - $planet == $row['planet'] && - $planettype == $row['planet_type']) { - if ($row['id_owner'] == $user['id']) { - $YourPlanet = true; - $UsedPlanet = true; - } else { - $UsedPlanet = true; - } - break; - } - } +$coords = array( + 'galaxy' => $galaxy, + 'system' => $system, + 'position' => $planet + ); +$destination = Legacies_Empire_Model_Planet::factoryFromCoords($coords, $planettype); +$session['planet_destination'] = $destination->getId(); - // Determinons les type de missions possibles par rapport a la planete cible - if ($_POST['planettype'] == "2") { - if ($_POST['ship209'] >= 1) { - $missiontype = array(8 => $lang['type_mission'][8]); - } else { - $missiontype = array(); - } - } elseif ($_POST['planettype'] == "1" || $_POST['planettype'] == "3") { - if ($_POST['ship208'] >= 1 && !$UsedPlanet) { - $missiontype = array(7 => $lang['type_mission'][7]); - } elseif ($_POST['ship210'] >= 1 && !$YourPlanet) { - $missiontype = array(6 => $lang['type_mission'][6]); - } +$user = Legacies_Empire_Model_User::getSingleton(); +$planetrow = $user->getCurrentPlanet(); - if ($_POST['ship202'] >= 1 || - $_POST['ship203'] >= 1 || - $_POST['ship204'] >= 1 || - $_POST['ship205'] >= 1 || - $_POST['ship206'] >= 1 || - $_POST['ship207'] >= 1 || - $_POST['ship210'] >= 1 || - $_POST['ship211'] >= 1 || - $_POST['ship213'] >= 1 || - $_POST['ship214'] >= 1 || - $_POST['ship215'] >= 1 || - $_POST['ship216'] >= 1) { - if (!$YourPlanet) { - $missiontype[1] = $lang['type_mission'][1]; - $missiontype[5] = $lang['type_mission'][5]; - } - $missiontype[3] = $lang['type_mission'][3]; - } +$YourPlanet = false; +if ($destination->getUserId() == $user->getId()) { + $YourPlanet = true; +} +$UsedPlanet = false; +if ($destination->getId()) { + $UsedPlanet = true; +} +$fleetArray = $session['fleet']; - } elseif ($_POST['ship209'] >= 1 || $_POST['ship208'] >= 1) { - $missiontype[3] = $lang['type_mission'][3]; - } - if ($YourPlanet) - $missiontype[4] = $lang['type_mission'][4]; +$missionTypes = array(); +// Determinons les type de missions possibles par rapport a la planete cible - if ( $_POST['planettype'] == 3 && - ($_POST['ship214'] || - $_POST['ship213']) && - !$YourPlanet && - $UsedPlanet) { - $missiontype[2] = $lang['type_mission'][2]; - } - if ( $_POST['planettype'] == 3 && - ($_POST['ship214'] >= 1 || $_POST['ship216'] >= 1) && - !$YourPlanet && - $UsedPlanet) { - $missiontype[9] = $lang['type_mission'][9]; - } +if ($position == (MAX_PLANET_IN_SYSTEM + 1)) { + $missionTypes[Legacies_Empire::ID_MISSION_EXPEDITION] = $lang['type_mission'][Legacies_Empire::ID_MISSION_EXPEDITION]; +} else { + if ($planettype == Legacies_Empire_Model_Planet::TYPE_DEBRIS) { + if (isset($fleetArray[Legacies_Empire::ID_SHIP_RECYCLER]) && $fleetArray[Legacies_Empire::ID_SHIP_RECYCLER] > 0) { + $missionTypes[Legacies_Empire::ID_MISSION_RECYCLE] = $lang['type_mission'][Legacies_Empire::ID_MISSION_RECYCLE]; + } + } else if ($planettype == Legacies_Empire_Model_Planet::TYPE_PLANET) { + if (isset($fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP]) && $fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP] > 0 && !$UsedPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_SETTLE_COLONY] = $lang['type_mission'][7]; + } + } else if ($planettype == Legacies_Empire_Model_Planet::TYPE_MOON) { + if (((isset($fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR]) && $fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA]) && $fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA] > 0)) && + !$YourPlanet && $UsedPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_DESTROY] = $lang['type_mission'][Legacies_Empire::ID_MISSION_DESTROY]; + } + } - $fleetarray = unserialize(base64_decode(str_rot13($_POST["usedfleet"]))); - $mission = $_POST['target_mission']; - $SpeedFactor = $_POST['speedfactor']; - $AllFleetSpeed = GetFleetMaxSpeed ($fleetarray, 0, $user); - $GenFleetSpeed = $_POST['speed']; - $MaxFleetSpeed = min($AllFleetSpeed); + if (in_array($planettype, array(Legacies_Empire_Model_Planet::TYPE_MOON, Legacies_Empire_Model_Planet::TYPE_PLANET))) { + if (isset($fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE]) && $fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE] > 0 && !$YourPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_SPY] = $lang['type_mission'][Legacies_Empire::ID_MISSION_SPY]; + } - $distance = GetTargetDistance ( $_POST['thisgalaxy'], $_POST['galaxy'], $_POST['thissystem'], $_POST['system'], $_POST['thisplanet'], $_POST['planet'] ); - $duration = GetMissionDuration ( $GenFleetSpeed, $MaxFleetSpeed, $distance, $SpeedFactor ); - $consumption = GetFleetConsumption ( $fleetarray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $user ); + if ((isset($fleetArray[Legacies_Empire::ID_SHIP_LIGHT_TRANSPORT]) && $fleetArray[Legacies_Empire::ID_SHIP_LIGHT_TRANSPORT] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_LARGE_TRANSPORT]) && $fleetArray[Legacies_Empire::ID_SHIP_LARGE_TRANSPORT] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_LIGHT_FIGHTER]) && $fleetArray[Legacies_Empire::ID_SHIP_LIGHT_FIGHTER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_HEAVY_FIGHTER]) && $fleetArray[Legacies_Empire::ID_SHIP_HEAVY_FIGHTER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_CRUISER]) && $fleetArray[Legacies_Empire::ID_SHIP_CRUISER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_BATTLESHIP]) && $fleetArray[Legacies_Empire::ID_SHIP_BATTLESHIP] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP]) && $fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_RECYCLER]) && $fleetArray[Legacies_Empire::ID_SHIP_RECYCLER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE]) && $fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE] > 0 && ALLOW_SPY_DRONE_ATTACKS) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_BOMBER]) && $fleetArray[Legacies_Empire::ID_SHIP_BOMBER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_DESTRUCTOR]) && $fleetArray[Legacies_Empire::ID_SHIP_DESTRUCTOR] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR]) && $fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_BATTLECRUISER]) && $fleetArray[Legacies_Empire::ID_SHIP_BATTLECRUISER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA]) && $fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA] > 0)) { - $MissionSelector = ""; - if (count($missiontype) > 0) { - if ($planet == 16) { - $MissionSelector .= ""; - $MissionSelector .= ""; - $MissionSelector .= "". $lang['type_mission'][15] ."

"; - $MissionSelector .= "". $lang['fl_expe_warning'] .""; - $MissionSelector .= ""; - $MissionSelector .= ""; - } else { - $i = 0; - foreach ($missiontype as $a => $b) { - $MissionSelector .= ""; - $MissionSelector .= ""; - $MissionSelector .= ""; - $MissionSelector .= "
"; - $MissionSelector .= ""; - $MissionSelector .= ""; - $i++; - } - } - } else { - $MissionSelector .= ""; - $MissionSelector .= ""; - $MissionSelector .= "". $lang['fl_bad_mission'] .""; - $MissionSelector .= ""; - $MissionSelector .= ""; - } + if (!$YourPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_ATTACK] = $lang['type_mission'][Legacies_Empire::ID_MISSION_ATTACK]; + $missionTypes[Legacies_Empire::ID_MISSION_GROUP_ATTACK] = $lang['type_mission'][Legacies_Empire::ID_MISSION_GROUP_ATTACK]; + $missionTypes[Legacies_Empire::ID_MISSION_STATION_ALLY] = $lang['type_mission'][Legacies_Empire::ID_MISSION_STATION_ALLY]; + } + $missionTypes[Legacies_Empire::ID_MISSION_TRANSPORT] = $lang['type_mission'][Legacies_Empire::ID_MISSION_TRANSPORT]; + } - if ($_POST['thisplanettype'] == 1) { - $TableTitle = "". $_POST['thisgalaxy'] .":". $_POST['thissystem'] .":". $_POST['thisplanet'] ." - ". $lang['fl_planet'] .""; - } elseif ($_POST['thisplanettype'] == 3) { - $TableTitle = "". $_POST['thisgalaxy'] .":". $_POST['thissystem'] .":". $_POST['thisplanet'] ." - ". $lang['fl_moon'] .""; - } + if ($YourPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_STATION] = $lang['type_mission'][Legacies_Empire::ID_MISSION_STATION]; + } + } +} - $page = ""; - $page .= "\n"; - $page .= "
"; - $page .= "
\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - foreach ($fleetarray as $Ship => $Count) { - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; +if (isset($fleetArray[Legacies_Empire::ID_SHIP_SOLAR_SATELLITE])) { + $missionTypes = array(); +} - } - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "
". $TableTitle ."
\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= $MissionSelector; - $page .= "\n"; - $page .= "
". $lang['fl_mission'] ."
\n"; - $page .= "		\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - $page .= "\n"; - if ($planet == 16) { - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - } elseif ( $missiontype[5] != '' ) { - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - } - $page .= "\n"; - $page .= "
". $lang['fl_ressources'] ."
". $lang['Metal'] ."". $lang['fl_selmax'] ."
". $lang['Crystal'] ."". $lang['fl_selmax'] ."
". $lang['Deuterium'] ."". $lang['fl_selmax'] ."
". $lang['fl_space_left'] ."
-
". $lang['fl_allressources'] ."
 
". $lang['fl_expe_staytime'] ."
"; - $page .= ""; - $page .= $lang['fl_expe_hours']; - $page .= "
". $lang['fl_expe_staytime'] ."
"; - $page .= ""; - $page .= $lang['fl_expe_hours']; - $page .= "
\n"; - $page .= "
\n"; - $page .= "
\n"; +$mission = isset($_POST['target_mission']) ? $_POST['target_mission'] : 0; - display($page, $lang['fl_title']); +$SpeedFactor = GetGameSpeedFactor(); +$AllFleetSpeed = GetFleetMaxSpeed($fleetArray, 0, $user); +$MaxFleetSpeed = min($AllFleetSpeed); -?> \ No newline at end of file +$distance = GetTargetDistance($planetrow->getGalaxy(), $galaxy, $planetrow->getSystem(), $system, $planetrow->getPosition(), $planet); +$duration = GetMissionDuration($speed, $MaxFleetSpeed, $distance, $SpeedFactor); +$consumption = GetFleetConsumption($fleetArray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $user ); + +$session['distance'] = $distance; +$session['duration'] = $duration; +$session['consumption'] = $consumption; +$session['speed'] = $speed; +$session['galaxy'] = $galaxy; +$session['system'] = $system; +$session['position'] = $planet; +$session['type'] = $planettype; + +$MissionSelector = ""; +if (count($missionTypes) > 0) { + if ($planet == (MAX_PLANET_IN_SYSTEM + 1)) { + $MissionSelector .= ""; + $MissionSelector .= ""; + $MissionSelector .= "". $lang['type_mission'][Legacies_Empire::ID_MISSION_EXPEDITION] ."

"; + $MissionSelector .= "". $lang['fl_expe_warning'] .""; + $MissionSelector .= ""; + $MissionSelector .= ""; + } else { + $i = 0; + foreach ($missionTypes as $a => $b) { + $MissionSelector .= ""; + $MissionSelector .= ""; + $MissionSelector .= ""; + $MissionSelector .= "
"; + $MissionSelector .= ""; + $MissionSelector .= ""; + $i++; + } + } +} else { + $MissionSelector .= ""; + $MissionSelector .= ""; + $MissionSelector .= "". $lang['fl_bad_mission'] .""; + $MissionSelector .= ""; + $MissionSelector .= ""; +} + +if ($planetrow->isPlanet()) { + $TableTitle = "{$planetrow->getCoords()} - {$lang['fl_planet']}"; +} elseif ($planetrow->isMoon()) { + $TableTitle = "{$planetrow->getCoords()} - {$lang['fl_moon']}"; +} + +$maxExpedition = $user->getElement(Legacies_Empire::ID_RESEARCH_EXPEDITION_TECHNOLOGY); +$ExpeditionEnCours = 0; +$EnvoiMaxExpedition = 0; +if ($maxExpedition >= 1) { + $maxexpde = doquery("SELECT 1 FROM {{table}} WHERE `fleet_owner` = '".$user['id']."' AND `fleet_mission` = '15';", 'fleets'); + $ExpeditionEnCours = $maxexpde->rowCount(); + $maxexpde->closeCursor(); + + $EnvoiMaxExpedition = 1 + floor($maxExpedition / 3); +} + +$maxfleet = doquery("SELECT 1 FROM {{table}} WHERE `fleet_owner` = '".$user['id']."';", 'fleets'); + +$MaxFlyingFleets = $maxfleet->rowCount(); +$maxfleet->closeCursor(); + +$page = ""; +$page .= "\n"; +$page .= "
"; +$page .= "
\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "getGalaxy() ."\" />\n"; +$page .= "getSystem() ."\" />\n"; +$page .= "getPosition() ."\" />\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "getType() ."\" />\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +foreach ($fleetArray as $shipId => $count) { + $page .= "\n"; + $page .= "\n"; + $page .= "\n"; + $page .= "\n"; + +} +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "
". $TableTitle ."
\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= $MissionSelector; +$page .= "\n"; +$page .= "
". $lang['fl_mission'] ."
\n"; +$page .= "		\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +$page .= "\n"; +if ($planet == (MAX_PLANET_IN_SYSTEM + 1)) { + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; +} else if (!isset($missionTypes[Legacies_Empire::ID_MISSION_STATION_ALLY])) { + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; +} +$page .= "\n"; +$page .= "
". $lang['fl_ressources'] ."
". $lang['Metal'] ."". $lang['fl_selmax'] ."
". $lang['Crystal'] ."". $lang['fl_selmax'] ."
". $lang['Deuterium'] ."". $lang['fl_selmax'] ."
". $lang['fl_space_left'] ."
-
". $lang['fl_allressources'] ."
 
". $lang['fl_expe_staytime'] ."
"; + $page .= ""; + $page .= $lang['fl_expe_hours']; + $page .= "
". $lang['fl_expe_staytime'] ."
"; + $page .= ""; + $page .= $lang['fl_expe_hours']; + $page .= "
\n"; +$page .= "
\n"; +$page .= "
\n"; + +display($page, $lang['fl_title']); diff --git a/floten3.php b/floten3.php index 17a36e8..75cf77e 100644 --- a/floten3.php +++ b/floten3.php @@ -32,508 +32,472 @@ define('INSIDE' , true); define('INSTALL' , false); require_once dirname(__FILE__) .'/common.php'; - $dpath = (!$user["dpath"]) ? DEFAULT_SKINPATH : $user["dpath"]; +includeLang('fleet'); - includeLang('fleet'); +$session = Legacies::getSession('fleet'); - $CurrentPlanet = doquery("SELECT * FROM {{table}} WHERE `id` = '". $user['current_planet'] ."'", 'planets', true); - $TargetPlanet = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '". $_POST['galaxy'] ."' AND `system` = '". $_POST['system'] ."' AND `planet` = '". $_POST['planet'] ."' AND `planet_type` = '". $_POST['planettype'] ."';", 'planets', true); - $MyDBRec = doquery("SELECT * FROM {{table}} WHERE `id` = '". $user['id']."';", 'users', true); +$user = Legacies_Empire_Model_User::getSingleton(); +$planet = $user->getCurrentPlanet(); - $protection = $gameConfig['noobprotection']; - $protectiontime = $gameConfig['noobprotectiontime']; - $protectionmulti = $gameConfig['noobprotectionmulti']; - if ($protectiontime < 1) { - $protectiontime = 9999999999999999; - } - - $fleetarray = unserialize(base64_decode(str_rot13($_POST["usedfleet"]))); - - if (!is_array($fleetarray)) { - message ("". $lang['fl_fleet_err'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - - // On verifie s'il y a assez de vaisseaux sur la planete ! - foreach ($fleetarray as $Ship => $Count) { - if ($Count > $CurrentPlanet[$resource[$Ship]]) { - message ("". $lang['fl_fleet_err'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - } - - $error = 0; - $galaxy = intval($_POST['galaxy']); - $system = intval($_POST['system']); - $planet = intval($_POST['planet']); - $planettype = intval($_POST['planettype']); - $fleetmission = $_POST['mission']; - - if ($planettype != 1 && $planettype != 2 && $planettype != 3) { - message ("". $lang['fl_fleet_err_pl'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - - if ($fleetmission == 8) { - $YourPlanet = false; - $UsedPlanet = false; - $select = doquery("SELECT * FROM {{table}} WHERE galaxy = '". $galaxy ."' AND system = '". $system ."' AND planet = '". $planet ."'", "planets"); - } else { - $YourPlanet = false; - $UsedPlanet = false; - $select = doquery("SELECT * FROM {{table}} WHERE galaxy = '". $galaxy ."' AND system = '". $system ."' AND planet = '". $planet ."' AND planet_type = '". $planettype ."'", "planets"); - } - - if ($CurrentPlanet['galaxy'] == $galaxy && - $CurrentPlanet['system'] == $system && - $CurrentPlanet['planet'] == $planet && - $CurrentPlanet['planet_type'] == $planettype) { - message ("". $lang['fl_ownpl_err'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - - // Test d'existance de l'enregistrement dans la gaalxie ! - if ($_POST['mission'] != 15) { - if (mysql_num_rows($select) < 1 && $fleetmission != 7) { - message ("". $lang['fl_unknow_target'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } elseif ($fleetmission == 9 && mysql_num_rows($select) < 1) { - message ("". $lang['fl_used_target'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - } else { - $EnvoiMaxExpedition = $_POST['maxepedition']; - $Expedition = $_POST['curepedition']; - - if ($EnvoiMaxExpedition == 0 ) { - message ("". $lang['fl_expe_notech'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } elseif ($Expedition >= $EnvoiMaxExpedition ) { - message ("". $lang['fl_expe_max'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - } - - $select = mysql_fetch_array($select); - - if ($select['id_owner'] == $user['id']) { - $YourPlanet = true; - $UsedPlanet = true; - } elseif (!empty($select['id_owner'])) { - $YourPlanet = false; - $UsedPlanet = true; - } else { - $YourPlanet = false; - $UsedPlanet = false; - } - - // Determinons les type de missions possibles par rapport a la planete cible - if ($fleetmission == 15) { - // Gestion des Exp�ditions - $missiontype = array(15 => $lang['type_mission'][15]); - } else { - if ($_POST['planettype'] == "2") { - if ($_POST['ship209'] >= 1) { - $missiontype = array(8 => $lang['type_mission'][8]); - } else { - $missiontype = array(); - } - } elseif ($_POST['planettype'] == "1" || $_POST['planettype'] == "3") { - if ($_POST['ship208'] >= 1 && !$UsedPlanet) { - $missiontype = array(7 => $lang['type_mission'][7]); - } elseif ($_POST['ship210'] >= 1 && !$YourPlanet) { - $missiontype = array(6 => $lang['type_mission'][6]); - } - - if ($_POST['ship202'] >= 1 || - $_POST['ship203'] >= 1 || - $_POST['ship204'] >= 1 || - $_POST['ship205'] >= 1 || - $_POST['ship206'] >= 1 || - $_POST['ship207'] >= 1 || - $_POST['ship210'] >= 1 || - $_POST['ship211'] >= 1 || - $_POST['ship213'] >= 1 || - $_POST['ship214'] >= 1 || - $_POST['ship215'] >= 1 || - $_POST['ship216'] >= 1) { - if (!$YourPlanet) { - $missiontype[1] = $lang['type_mission'][1]; - $missiontype[5] = $lang['type_mission'][5]; - } - $missiontype[3] = $lang['type_mission'][3]; - } +$galaxy = isset($_POST['galaxy']) ? intval($_POST['galaxy']) : 0; +$system = isset($_POST['system']) ? intval($_POST['system']) : 0; +$position = isset($_POST['planet']) ? intval($_POST['planet']) : 0; +$type = isset($_POST['planettype']) ? intval($_POST['planettype']) : 0; +$mission = isset($_POST['mission']) ? intval($_POST['mission']) : 0; +$galaxy = isset($session['galaxy']) ? $session['galaxy'] : 0; +$system = isset($session['system']) ? $session['system'] : 0; +$position = isset($session['position']) ? $session['position'] : 0; +$type = isset($session['type']) ? $session['type'] : 0; +$speed = isset($session['speed']) ? $session['speed'] : 10; - } elseif ($_POST['ship209'] >= 1 || $_POST['ship208'] >= 1) { - $missiontype[3] = $lang['type_mission'][3]; - } - if ($YourPlanet) - $missiontype[4] = $lang['type_mission'][4]; +$protection = $gameConfig['noobprotection']; +$protectiontime = $gameConfig['noobprotectiontime']; +$protectionmulti = $gameConfig['noobprotectionmulti']; - if ( $_POST['planettype'] == 3 && - ($_POST['ship214'] || - $_POST['ship213']) && - !$YourPlanet && - $UsedPlanet) { - $missiontype[2] = $lang['type_mission'][2]; - } - if ($_POST['planettype'] == 3 && - ($_POST['ship214'] >= 1 || $_POST['ship216'] >= 1) && - !$YourPlanet && $UsedPlanet) { - $missiontype[9] = $lang['type_mission'][9]; +if ($protectiontime < 1) { + $protectiontime = 9999999999999999; +} + +$fleetArray = $session['fleet']; + +if (!is_array($fleetArray)) { + message ("". $lang['fl_fleet_err'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); +} + +// On verifie s'il y a assez de vaisseaux sur la planete ! +foreach ($fleetArray as $shipId => $count) { + if ($Count > $planet->getElement($shipId)) { + message ("". $lang['fl_fleet_err'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } +} + +$allowedPlanetTypes = array( + Legacies_Empire_Model_Planet::TYPE_PLANET, + Legacies_Empire_Model_Planet::TYPE_DEBRIS, + Legacies_Empire_Model_Planet::TYPE_MOON + ); +if (!in_array($type, $allowedPlanetTypes)) { + message ("". $lang['fl_fleet_err_pl'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); +} + +if ($planet->getGalaxy() == $galaxy && + $planet->getSystem() == $system && + $planet->getPosition() == $position && + $planet->getType() == $type) { + message ("". $lang['fl_ownpl_err'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); +} + +$YourPlanet = false; +$UsedPlanet = false; +$coords = array( + 'galaxy' => $galaxy, + 'system' => $system, + 'position' => $position + ); +if ($mission == Legacies_Empire::ID_MISSION_RECYCLE) { + $destination = Legacies_Empire_Model_Planet::factoryFromCoords($coords); +} else { + $destination = Legacies_Empire_Model_Planet::factoryFromCoords($coords, $type); +} + +// Test d'existence de l'enregistrement dans la galaxie ! +if ($mission != Legacies_Empire::ID_MISSION_EXPEDITION) { + if (!$destination->getId()) { + if ($mission != Legacies_Empire::ID_MISSION_SETTLE_COLONY) { + message ("". $lang['fl_unknow_target'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } else if ($mission == Legacies_Empire::ID_MISSION_DESTROY) { + message ("". $lang['fl_used_target'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); } - } + } else if ($mission == Legacies_Empire::ID_MISSION_DESTROY && !$destination->isMoon()) { + message ("". $lang['fl_used_target'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } +} else { - if (empty($missiontype[$fleetmission])) { - message ("". $lang['fl_bad_mission'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } + $EnvoiMaxExpedition = $user->getElement(Legacies_Empire::ID_RESEARCH_EXPEDITION_TECHNOLOGY); + $Expedition = 0; + if ($EnvoiMaxExpedition > 0) { + $maxexpde = doquery("SELECT 1 FROM {{table}} WHERE `fleet_owner` = '".$user['id']."' AND `fleet_mission` = '15';", 'fleets'); + $Expedition = $maxexpde->rowCount(); + $maxexpde->closeCursor(); + } - CheckPlanetUsedFields($CurrentPlanet); + if ($EnvoiMaxExpedition == 0 ) { + message ("". $lang['fl_expe_notech'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } else if ($Expedition >= $EnvoiMaxExpedition ) { + message ("". $lang['fl_expe_max'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } +} - if ($TargetPlanet['id_owner'] == '') { - $HeDBRec = $MyDBRec; - } elseif ($TargetPlanet['id_owner'] != '') { - $HeDBRec = doquery("SELECT * FROM {{table}} WHERE `id` = '". $TargetPlanet['id_owner'] ."';", 'users', true); - } +if ($destination->getUserId() == $user['id']) { + $YourPlanet = true; + $UsedPlanet = true; +} else if ($destination['id_owner']->getId()) { + $UsedPlanet = true; +} - $UserPoints = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $MyDBRec['id'] ."';", 'statpoints', true); - $User2Points = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $HeDBRec['id'] ."';", 'statpoints', true); +$missionTypes = array(); +// Determinons les type de missions possibles par rapport a la planete cible +if ($position == (MAX_PLANET_IN_SYSTEM + 1)) { + $missionTypes[Legacies_Empire::ID_MISSION_EXPEDITION] = $lang['type_mission'][Legacies_Empire::ID_MISSION_EXPEDITION]; +} else { + if ($type == Legacies_Empire_Model_Planet::TYPE_DEBRIS) { + if (isset($fleetArray[Legacies_Empire::ID_SHIP_RECYCLER]) && $fleetArray[Legacies_Empire::ID_SHIP_RECYCLER] > 0) { + $missionTypes[Legacies_Empire::ID_MISSION_RECYCLE] = $lang['type_mission'][Legacies_Empire::ID_MISSION_RECYCLE]; + } + } else if ($type == Legacies_Empire_Model_Planet::TYPE_PLANET) { + if (isset($fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP]) && $fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP] > 0 && !$UsedPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_SETTLE_COLONY] = $lang['type_mission'][7]; + } + } else if ($type == Legacies_Empire_Model_Planet::TYPE_MOON) { + if (((isset($fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR]) && $fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA]) && $fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA] > 0)) && + !$YourPlanet && $UsedPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_DESTROY] = $lang['type_mission'][Legacies_Empire::ID_MISSION_DESTROY]; + } + } - $MyGameLevel = $UserPoints['total_points']; - $HeGameLevel = $User2Points['total_points']; - $VacationMode = $HeDBRec['urlaubs_modus']; + if (in_array($type, array(Legacies_Empire_Model_Planet::TYPE_MOON, Legacies_Empire_Model_Planet::TYPE_PLANET))) { + if (isset($fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE]) && $fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE] > 0 && !$YourPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_SPY] = $lang['type_mission'][Legacies_Empire::ID_MISSION_SPY]; + } - if ($MyGameLevel > ($HeGameLevel * $protectionmulti) AND - $TargetPlanet['id_owner'] != '' AND - $_POST['mission'] == 1 AND - $protection == 1 AND - $HeGameLevel < ($protectiontime * 1000)) { - message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); - } + if ((isset($fleetArray[Legacies_Empire::ID_SHIP_LIGHT_TRANSPORT]) && $fleetArray[Legacies_Empire::ID_SHIP_LIGHT_TRANSPORT] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_LARGE_TRANSPORT]) && $fleetArray[Legacies_Empire::ID_SHIP_LARGE_TRANSPORT] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_LIGHT_FIGHTER]) && $fleetArray[Legacies_Empire::ID_SHIP_LIGHT_FIGHTER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_HEAVY_FIGHTER]) && $fleetArray[Legacies_Empire::ID_SHIP_HEAVY_FIGHTER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_CRUISER]) && $fleetArray[Legacies_Empire::ID_SHIP_CRUISER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_BATTLESHIP]) && $fleetArray[Legacies_Empire::ID_SHIP_BATTLESHIP] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP]) && $fleetArray[Legacies_Empire::ID_SHIP_COLONY_SHIP] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_RECYCLER]) && $fleetArray[Legacies_Empire::ID_SHIP_RECYCLER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE]) && $fleetArray[Legacies_Empire::ID_SHIP_SPY_DRONE] > 0 && ALLOW_SPY_DRONE_ATTACKS) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_BOMBER]) && $fleetArray[Legacies_Empire::ID_SHIP_BOMBER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_DESTRUCTOR]) && $fleetArray[Legacies_Empire::ID_SHIP_DESTRUCTOR] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR]) && $fleetArray[Legacies_Empire::ID_SHIP_DEATH_STAR] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_BATTLECRUISER]) && $fleetArray[Legacies_Empire::ID_SHIP_BATTLECRUISER] > 0) || + (isset($fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA]) && $fleetArray[Legacies_Empire::ID_SHIP_SUPERNOVA] > 0)) { - if ($MyGameLevel > ($HeGameLevel * $protectionmulti) AND - $TargetPlanet['id_owner'] != '' AND - $_POST['mission'] == 5 AND - $protection == 1 AND - $HeGameLevel < ($protectiontime * 1000)) { - message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); - } + if (!$YourPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_ATTACK] = $lang['type_mission'][Legacies_Empire::ID_MISSION_ATTACK]; + $missionTypes[Legacies_Empire::ID_MISSION_GROUP_ATTACK] = $lang['type_mission'][Legacies_Empire::ID_MISSION_GROUP_ATTACK]; + $missionTypes[Legacies_Empire::ID_MISSION_STATION_ALLY] = $lang['type_mission'][Legacies_Empire::ID_MISSION_STATION_ALLY]; + } + $missionTypes[Legacies_Empire::ID_MISSION_TRANSPORT] = $lang['type_mission'][Legacies_Empire::ID_MISSION_TRANSPORT]; + } - if ($MyGameLevel > ($HeGameLevel * $protectionmulti) AND - $TargetPlanet['id_owner'] != '' AND - $_POST['mission'] == 6 AND - $protection == 1 AND - $HeGameLevel < ($protectiontime * 1000)) { - message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); - } + if ($YourPlanet) { + $missionTypes[Legacies_Empire::ID_MISSION_STATION] = $lang['type_mission'][Legacies_Empire::ID_MISSION_STATION]; + } + } +} - if (($MyGameLevel * $protectionmulti) < $HeGameLevel AND - $TargetPlanet['id_owner'] != '' AND - $_POST['mission'] == 1 AND - $protection == 1 AND - $MyGameLevel < ($protectiontime * 1000)) { - message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); - } +if (isset($fleetArray[Legacies_Empire::ID_SHIP_SOLAR_SATELLITE])) { + $missionTypes = array(); +} - if (($MyGameLevel * $protectionmulti) < $HeGameLevel AND - $TargetPlanet['id_owner'] != '' AND - $_POST['mission'] == 5 AND - $protection == 1 AND - $MyGameLevel < ($protectiontime * 1000)) { - message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); - } +if (!isset($missionTypes[$mission])) { + message ("". $lang['fl_bad_mission'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); +} - if (($MyGameLevel * $protectionmulti) < $HeGameLevel AND - $TargetPlanet['id_owner'] != '' AND - $_POST['mission'] == 6 AND - $protection == 1 AND - $MyGameLevel < ($protectiontime * 1000)) { - message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); - } +if (!$destination->getId()) { + $destinationUser = $user; +} else { + $destinationUser = $destination->getUser(); +} - if ($VacationMode AND $_POST['mission'] != 8) { - message("".$lang['fl_vacation_pla']."", $lang['fl_vacation_ttl'], "fleet." . PHPEXT, 2); - } +$userPoints = doquery("SELECT total_points FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner`='{$user->getId()}'", 'statpoints', true); +$myGameLevel = $userPoints['total_points']; +if ($destinationUser->getId()) { + $destinationPoints = doquery("SELECT total_points FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '{$destinationUser->getId()}';", 'statpoints', true); + $hisGameLevel = $destinationPoints['total_points']; +} else { + $hisGameLevel = 0; +} - $FlyingFleets = mysql_fetch_assoc(doquery("SELECT COUNT(fleet_id) as Number FROM {{table}} WHERE `fleet_owner`='{$user['id']}'", 'fleets')); - $ActualFleets = $FlyingFleets["Number"]; - if (($user[$resource[108]] + 1) <= $ActualFleets) { - message("Pas de slot disponible", "Erreur", "fleet." . PHPEXT, 1); - } +$vacationMode = $destinationUser['urlaubs_modus']; - if ($_POST['resource1'] + $_POST['resource2'] + $_POST['resource3'] < 1 AND $_POST['mission'] == 3) { - message("".$lang['fl_noenoughtgoods']."", $lang['type_mission'][3], "fleet." . PHPEXT, 1); - } - if ($_POST['mission'] != 15) { - if ($TargetPlanet['id_owner'] == '' AND $_POST['mission'] < 7) { - message ("". $lang['fl_bad_planet01'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - if ($TargetPlanet['id_owner'] != '' AND $_POST['mission'] == 7) { - message ("". $lang['fl_bad_planet02'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - if ($HeDBRec['ally_id'] != $MyDBRec['ally_id'] AND $_POST['mission'] == 4) { - message ("". $lang['fl_dont_stay_here'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - if ($TargetPlanet['ally_deposit'] < 1 AND $HeDBRec != $MyDBRec AND $_POST['mission'] == 5) { - message ("". $lang['fl_no_allydeposit'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - if (($TargetPlanet["id_owner"] == $CurrentPlanet["id_owner"]) AND ($_POST["mission"] == 1)) { - message ("". $lang['fl_no_self_attack'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - if (($TargetPlanet["id_owner"] == $CurrentPlanet["id_owner"]) AND ($_POST["mission"] == 6)) { - message ("". $lang['fl_no_self_spy'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - if (($TargetPlanet["id_owner"] != $CurrentPlanet["id_owner"]) AND ($_POST["mission"] == 4)) { - message ("". $lang['fl_only_stay_at_home'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } - } +if ($protection) { + $protectedMissions = array( + Legacies_Empire::ID_MISSION_ATTACK, + Legacies_Empire::ID_MISSION_GROUP_ATTACK, + Legacies_Empire::ID_MISSION_STATION_ALLY, + Legacies_Empire::ID_MISSION_SPY, + Legacies_Empire::ID_MISSION_DESTROY + ); - $missiontype = array( - 1 => $lang['type_mission'][1], - 2 => $lang['type_mission'][2], - 3 => $lang['type_mission'][3], - 4 => $lang['type_mission'][4], - 5 => $lang['type_mission'][5], - 6 => $lang['type_mission'][6], - 7 => $lang['type_mission'][7], - 8 => $lang['type_mission'][8], - 9 => $lang['type_mission'][9], - 15 => $lang['type_mission'][15], - ); + if ($myGameLevel > ($hisGameLevel * $protectionmulti) && $destinationUser->getId() && + in_array($mission, $protectedMissions) && $hisGameLevel < ($protectiontime * 1000)) { + message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); + } - $speed_possible = array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1); + if (($myGameLevel * $protectionmulti) < $hisGameLevel && $destinationUser->getId() && + in_array($mission, $protectedMissions) && $myGameLevel < ($protectiontime * 1000)) { + message("".$lang['fl_noob_mess_n']."", $lang['fl_noob_title'], "fleet." . PHPEXT, 2); + } +} - $AllFleetSpeed = GetFleetMaxSpeed ($fleetarray, 0, $user); - $GenFleetSpeed = $_POST['speed']; - $SpeedFactor = $_POST['speedfactor']; - $MaxFleetSpeed = min($AllFleetSpeed); +if ($vacationMode && $mission != Legacies_Empire::ID_MISSION_RECYCLE) { + message("".$lang['fl_vacation_pla']."", $lang['fl_vacation_ttl'], "fleet." . PHPEXT, 2); +} - if (!in_array($GenFleetSpeed, $speed_possible)) { - message ("". $lang['fl_cheat_speed'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } +$currentFleets = $user->getFleets()->count(); - $CurrentPlanet = doquery("SELECT * FROM {{table}} WHERE `id` = '".$user['current_planet']."';", 'planets', true); +if (($user->getElement(Legacies_Empire::ID_RESEARCH_COMPUTER_TECHNOLOGY) + 1) <= $currentFleets) { + message("Pas de slot disponible", "Erreur", "fleet." . PHPEXT, 1); +} - if ($MaxFleetSpeed != $_POST['speedallsmin']) { - message ("". $lang['fl_cheat_speed'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } +$metal = isset($_POST['resource1']) ? intval($_POST['resource1']) : 0; +$cristal = isset($_POST['resource2']) ? intval($_POST['resource2']) : 0; +$deuterium = isset($_POST['resource3']) ? intval($_POST['resource3']) : 0; - if (!$_POST['planettype']) { - message ("". $lang['fl_no_planet_type'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } +if ($metal + $cristal + $deuterium < 1 && $mission == Legacies_Empire::ID_MISSION_TRANSPORT) { + message("".$lang['fl_noenoughtgoods']."", $lang['type_mission'][3], "fleet." . PHPEXT, 1); +} +if ($mission != Legacies_Empire::ID_MISSION_EXPEDITION) { + $userMissions = array( + Legacies_Empire::ID_MISSION_ATTACK, + Legacies_Empire::ID_MISSION_GROUP_ATTACK, + Legacies_Empire::ID_MISSION_TRANSPORT, + Legacies_Empire::ID_MISSION_STATION, + Legacies_Empire::ID_MISSION_STATION_ALLY, + Legacies_Empire::ID_MISSION_SPY + ); + if (!$destination->getUserId() && in_array($mission, $userMissions)) { + message ("". $lang['fl_bad_planet01'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } + if ($destination->getId() && $mission == Legacies_Empire::ID_MISSION_SETTLE_COLONY) { + message ("". $lang['fl_bad_planet02'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } + if ($destination->getId() != $planet->getId() && $mission == Legacies_Empire::ID_MISSION_STATION) { + message ("". $lang['fl_dont_stay_here'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } + if ($destination->getElement(Legacies_Empire::ID_BUILDING_ALLIANCE_DEPOT) < 1 && $destinationUser->getId() != $user->getId() && $mission == Legacies_Empire::ID_MISSION_STATION_ALLY) { + message ("". $lang['fl_no_allydeposit'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } + if ($destinationUser->getId() != $user->getId() && ($mission == Legacies_Empire::ID_MISSION_ATTACK)) { + message ("". $lang['fl_no_self_attack'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } + if ($destinationUser->getId() != $user->getId() && ($mission == Legacies_Empire::ID_MISSION_SPY)) { + message ("". $lang['fl_no_self_spy'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } + if ($destinationUser->getId() != $user->getId() && $mission == Legacies_Empire::ID_MISSION_STATION) { + message ("". $lang['fl_only_stay_at_home'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } +} - // Test de coherance de la destination (voir si elle se trouve dans les limites de l'univers connu - $error = 0; - $errorlist = ""; - if (!$_POST['galaxy'] || !is_numeric($_POST['galaxy']) || $_POST['galaxy'] > MAX_GALAXY_IN_WORLD || $_POST['galaxy'] < 1) { - $error++; - $errorlist .= $lang['fl_limit_galaxy']; - } - if (!$_POST['system'] || !is_numeric($_POST['system']) || $_POST['system'] > MAX_SYSTEM_IN_GALAXY || $_POST['system'] < 1) { - $error++; - $errorlist .= $lang['fl_limit_system']; - } - if (!$_POST['planet'] || !is_numeric($_POST['planet']) || $_POST['planet'] > MAX_PLANET_IN_SYSTEM+1 || $_POST['planet'] < 1) { - $error++; - $errorlist .= $lang['fl_limit_planet']; - } +$possibleSpeeds = array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1); - if ($error > 0) { - message ("
    " . $errorlist . "
", $lang['fl_error'], "fleet." . PHPEXT, 2); - } +$AllFleetSpeed = GetFleetMaxSpeed($fleetArray, 0, $user); +$SpeedFactor = GetGameSpeedFactor(); +$MaxFleetSpeed = min($AllFleetSpeed); - // La flotte part bien de la planete courrante ?? - if ($_POST['thisgalaxy'] != $CurrentPlanet['galaxy'] | - $_POST['thissystem'] != $CurrentPlanet['system'] | - $_POST['thisplanet'] != $CurrentPlanet['planet'] | - $_POST['thisplanettype'] != $CurrentPlanet['planet_type']) { - message ("". $lang['fl_cheat_origine'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } +if (!in_array($speed, $possibleSpeeds)) { + message ("". $lang['fl_cheat_speed'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); +} - if (!isset($fleetarray)) { - message ("". $lang['fl_no_fleetarray'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } +$error = 0; +$errorlist = ""; +if ($galaxy > MAX_GALAXY_IN_WORLD || $galaxy < 1) { + $error++; + $errorlist .= $lang['fl_limit_galaxy']; +} +if ($system > MAX_SYSTEM_IN_GALAXY || $system < 1) { + $error++; + $errorlist .= $lang['fl_limit_system']; +} +if ($position > (MAX_PLANET_IN_SYSTEM + 1) || $position < 1) { + $error++; + $errorlist .= $lang['fl_limit_planet']; +} - $distance = GetTargetDistance ( $_POST['thisgalaxy'], $_POST['galaxy'], $_POST['thissystem'], $_POST['system'], $_POST['thisplanet'], $_POST['planet'] ); - $duration = GetMissionDuration ( $GenFleetSpeed, $MaxFleetSpeed, $distance, $SpeedFactor ); - $consumption = GetFleetConsumption ( $fleetarray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $user ); +if ($error > 0) { + message ("
    " . $errorlist . "
", $lang['fl_error'], "fleet." . PHPEXT, 2); +} - $fleet['start_time'] = $duration + time(); - if ($_POST['mission'] == 15) { - $StayDuration = $_POST['expeditiontime'] * 3600; - $StayTime = $fleet['start_time'] + $_POST['expeditiontime'] * 3600; - } elseif ($_POST['mission'] == 5) { - $StayDuration = $_POST['holdingtime'] * 3600; - $StayTime = $fleet['start_time'] + $_POST['holdingtime'] * 3600; - } else { - $StayDuration = 0; - $StayTime = 0; - } - $fleet['end_time'] = $StayDuration + (2 * $duration) + time(); - $FleetStorage = 0; - $FleetShipCount = 0; - $fleet_array = ""; - $FleetSubQRY = ""; +if (!isset($fleetArray)) { + message ("". $lang['fl_no_fleetarray'] ."", $lang['fl_error'], "fleet." . PHPEXT, 2); +} - foreach ($fleetarray as $Ship => $Count) { - $FleetStorage += $pricelist[$Ship]["capacity"] * $Count; - $FleetShipCount += $Count; - $fleet_array .= $Ship .",". $Count .";"; - $FleetSubQRY .= "`".$resource[$Ship] . "` = `" . $resource[$Ship] . "` - " . $Count . " , "; - } +$distance = GetTargetDistance($planet->getGalaxy(), $galaxy, $planet->getSystem(), $system, $planet->getPosition(), $position); +$duration = GetMissionDuration($speed, $MaxFleetSpeed, $distance, $SpeedFactor); +$consumption = GetFleetConsumption($fleetArray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $user); - $FleetStorage -= $consumption; - $StorageNeeded = 0; - if ($_POST['resource1'] < 1) { - $TransMetal = 0; - } else { - $TransMetal = $_POST['resource1']; - $StorageNeeded += $TransMetal; - } - if ($_POST['resource2'] < 1) { - $TransCrystal = 0; - } else { - $TransCrystal = $_POST['resource2']; - $StorageNeeded += $TransCrystal; - } - if ($_POST['resource3'] < 1) { - $TransDeuterium = 0; - } else { - $TransDeuterium = $_POST['resource3']; - $StorageNeeded += $TransDeuterium; - } +/***************/ + $fleet['start_time'] = $duration + time(); + if ($mission == Legacies_Empire::ID_MISSION_EXPEDITION) { + $StayDuration = $_POST['expeditiontime'] * 3600; + $StayTime = $fleet['start_time'] + $_POST['expeditiontime'] * 3600; + } elseif ($_POST['mission'] == 5) { + $StayDuration = $_POST['holdingtime'] * 3600; + $StayTime = $fleet['start_time'] + $_POST['holdingtime'] * 3600; + } else { + $StayDuration = 0; + $StayTime = 0; + } + $fleet['end_time'] = $StayDuration + (2 * $duration) + time(); + $FleetStorage = 0; + $FleetShipCount = 0; + $fleet_array = ""; + $FleetSubQRY = ""; - $StockMetal = $CurrentPlanet['metal']; - $StockCrystal = $CurrentPlanet['crystal']; - $StockDeuterium = $CurrentPlanet['deuterium']; - $StockDeuterium -= $consumption; + foreach ($fleetArray as $Ship => $Count) { + $FleetStorage += $pricelist[$Ship]["capacity"] * $Count; + $FleetShipCount += $Count; + $fleet_array .= $Ship .",". $Count .";"; + $FleetSubQRY .= "`".$resource[$Ship] . "` = `" . $resource[$Ship] . "` - " . $Count . " , "; + } - $StockOk = false; - if ($StockMetal >= $TransMetal) { - if ($StockCrystal >= $TransCrystal) { - if ($StockDeuterium >= $TransDeuterium) { - $StockOk = true; - } - } - } - if ( !$StockOk ) { - message ("". $lang['fl_noressources'] . pretty_number($consumption) ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } + $FleetStorage -= $consumption; + $StorageNeeded = 0; + if ($_POST['resource1'] < 1) { + $TransMetal = 0; + } else { + $TransMetal = $_POST['resource1']; + $StorageNeeded += $TransMetal; + } + if ($_POST['resource2'] < 1) { + $TransCrystal = 0; + } else { + $TransCrystal = $_POST['resource2']; + $StorageNeeded += $TransCrystal; + } + if ($_POST['resource3'] < 1) { + $TransDeuterium = 0; + } else { + $TransDeuterium = $_POST['resource3']; + $StorageNeeded += $TransDeuterium; + } - if ( $StorageNeeded > $FleetStorage) { - message ("". $lang['fl_nostoragespa'] . pretty_number($StorageNeeded - $FleetStorage) ."", $lang['fl_error'], "fleet." . PHPEXT, 2); - } + $StockMetal = $planet['metal']; + $StockCrystal = $planet['crystal']; + $StockDeuterium = $planet['deuterium']; + $StockDeuterium -= $consumption; - if ($TargetPlanet['id_level'] > $user['authlevel']) { - $Allowed = true; - switch ($_POST['mission']){ - case 1: - case 2: - case 6: - case 9: - $Allowed = false; - break; - case 3: - case 4: - case 5: - case 7: - case 8: - case 15: - break; - default: - } - if ($Allowed == false) { - message ("". $lang['fl_adm_attak'] ."", $lang['fl_warning'], "fleet." . PHPEXT, 2); - } - } + $StockOk = false; + if ($StockMetal >= $TransMetal) { + if ($StockCrystal >= $TransCrystal) { + if ($StockDeuterium >= $TransDeuterium) { + $StockOk = true; + } + } + } + if ( !$StockOk ) { + message ("". $lang['fl_noressources'] . pretty_number($consumption) ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } - // ecriture de l'enregistrement de flotte (a partir de l�, y a quelque chose qui vole et c'est toujours sur la planete d'origine) - $QryInsertFleet = "INSERT INTO {{table}} SET "; - $QryInsertFleet .= "`fleet_owner` = '". $user['id'] ."', "; - $QryInsertFleet .= "`fleet_mission` = '". $_POST['mission'] ."', "; - $QryInsertFleet .= "`fleet_amount` = '". $FleetShipCount ."', "; - $QryInsertFleet .= "`fleet_array` = '". $fleet_array ."', "; - $QryInsertFleet .= "`fleet_start_time` = '". $fleet['start_time'] ."', "; - $QryInsertFleet .= "`fleet_start_galaxy` = '". intval($_POST['thisgalaxy']) ."', "; - $QryInsertFleet .= "`fleet_start_system` = '". intval($_POST['thissystem']) ."', "; - $QryInsertFleet .= "`fleet_start_planet` = '". intval($_POST['thisplanet']) ."', "; - $QryInsertFleet .= "`fleet_start_type` = '". intval($_POST['thisplanettype']) ."', "; - $QryInsertFleet .= "`fleet_end_time` = '". $fleet['end_time'] ."', "; - $QryInsertFleet .= "`fleet_end_stay` = '". $StayTime ."', "; - $QryInsertFleet .= "`fleet_end_galaxy` = '". intval($_POST['galaxy']) ."', "; - $QryInsertFleet .= "`fleet_end_system` = '". intval($_POST['system']) ."', "; - $QryInsertFleet .= "`fleet_end_planet` = '". intval($_POST['planet']) ."', "; - $QryInsertFleet .= "`fleet_end_type` = '". intval($_POST['planettype']) ."', "; - $QryInsertFleet .= "`fleet_resource_metal` = '". intval($TransMetal) ."', "; - $QryInsertFleet .= "`fleet_resource_crystal` = '". intval($TransCrystal) ."', "; - $QryInsertFleet .= "`fleet_resource_deuterium` = '". intval($TransDeuterium) ."', "; - $QryInsertFleet .= "`fleet_target_owner` = '". $TargetPlanet['id_owner'] ."', "; - $QryInsertFleet .= "`start_time` = '". time() ."';"; - doquery( $QryInsertFleet, 'fleets'); + if ( $StorageNeeded > $FleetStorage) { + message ("". $lang['fl_nostoragespa'] . pretty_number($StorageNeeded - $FleetStorage) ."", $lang['fl_error'], "fleet." . PHPEXT, 2); + } + + if ($destination['id_level'] > $user['authlevel']) { + $Allowed = true; + switch ($_POST['mission']){ + case 1: + case 2: + case 6: + case 9: + $Allowed = false; + break; + case 3: + case 4: + case 5: + case 7: + case 8: + case 15: + break; + default: + } + if ($Allowed == false) { + message ("". $lang['fl_adm_attak'] ."", $lang['fl_warning'], "fleet." . PHPEXT, 2); + } + } + + // ecriture de l'enregistrement de flotte (a partir de l�, y a quelque chose qui vole et c'est toujours sur la planete d'origine) + $QryInsertFleet = "INSERT INTO {{table}} SET "; + $QryInsertFleet .= "`fleet_owner` = '". $user['id'] ."', "; + $QryInsertFleet .= "`fleet_mission` = '". $_POST['mission'] ."', "; + $QryInsertFleet .= "`fleet_amount` = '". $FleetShipCount ."', "; + $QryInsertFleet .= "`fleet_array` = '". $fleet_array ."', "; + $QryInsertFleet .= "`fleet_start_time` = '". $fleet['start_time'] ."', "; + $QryInsertFleet .= "`fleet_start_galaxy` = '". intval($_POST['thisgalaxy']) ."', "; + $QryInsertFleet .= "`fleet_start_system` = '". intval($_POST['thissystem']) ."', "; + $QryInsertFleet .= "`fleet_start_planet` = '". intval($_POST['thisplanet']) ."', "; + $QryInsertFleet .= "`fleet_start_type` = '". intval($_POST['thisplanettype']) ."', "; + $QryInsertFleet .= "`fleet_end_time` = '". $fleet['end_time'] ."', "; + $QryInsertFleet .= "`fleet_end_stay` = '". $StayTime ."', "; + $QryInsertFleet .= "`fleet_end_galaxy` = '". intval($_POST['galaxy']) ."', "; + $QryInsertFleet .= "`fleet_end_system` = '". intval($_POST['system']) ."', "; + $QryInsertFleet .= "`fleet_end_planet` = '". intval($_POST['planet']) ."', "; + $QryInsertFleet .= "`fleet_end_type` = '". intval($_POST['planettype']) ."', "; + $QryInsertFleet .= "`fleet_resource_metal` = '". intval($TransMetal) ."', "; + $QryInsertFleet .= "`fleet_resource_crystal` = '". intval($TransCrystal) ."', "; + $QryInsertFleet .= "`fleet_resource_deuterium` = '". intval($TransDeuterium) ."', "; + $QryInsertFleet .= "`fleet_target_owner` = '". $destination['id_owner'] ."', "; + $QryInsertFleet .= "`start_time` = '". time() ."';"; + doquery( $QryInsertFleet, 'fleets'); - $CurrentPlanet["metal"] = $CurrentPlanet["metal"] - $TransMetal; - $CurrentPlanet["crystal"] = $CurrentPlanet["crystal"] - $TransCrystal; - $CurrentPlanet["deuterium"] = $CurrentPlanet["deuterium"] - $TransDeuterium; - $CurrentPlanet["deuterium"] = $CurrentPlanet["deuterium"] - $consumption; + $planet["metal"] = $planet["metal"] - $TransMetal; + $planet["crystal"] = $planet["crystal"] - $TransCrystal; + $planet["deuterium"] = $planet["deuterium"] - $TransDeuterium; + $planet["deuterium"] = $planet["deuterium"] - $consumption; - $QryUpdatePlanet = "UPDATE {{table}} SET "; - $QryUpdatePlanet .= $FleetSubQRY; - $QryUpdatePlanet .= "`metal` = '". $CurrentPlanet["metal"] ."', "; - $QryUpdatePlanet .= "`crystal` = '". $CurrentPlanet["crystal"] ."', "; - $QryUpdatePlanet .= "`deuterium` = '". $CurrentPlanet["deuterium"] ."' "; - $QryUpdatePlanet .= "WHERE "; - $QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."'"; + $QryUpdatePlanet = "UPDATE {{table}} SET "; + $QryUpdatePlanet .= $FleetSubQRY; + $QryUpdatePlanet .= "`metal` = '". $planet["metal"] ."', "; + $QryUpdatePlanet .= "`crystal` = '". $planet["crystal"] ."', "; + $QryUpdatePlanet .= "`deuterium` = '". $planet["deuterium"] ."' "; + $QryUpdatePlanet .= "WHERE "; + $QryUpdatePlanet .= "`id` = '". $planet['id'] ."'"; - // Mise a jours de l'enregistrement de la planete de depart (a partir de là, y a quelque chose qui vole et ce n'est plus sur la planete de depart) - doquery("LOCK TABLE {{table}} WRITE", 'planets'); - doquery ($QryUpdatePlanet, "planets"); - doquery("UNLOCK TABLES", ''); -// doquery("FLUSH TABLES", ''); + // Mise a jours de l'enregistrement de la planete de depart (a partir de là, y a quelque chose qui vole et ce n'est plus sur la planete de depart) + doquery("LOCK TABLE {{table}} WRITE", 'planets'); + doquery ($QryUpdatePlanet, "planets"); + doquery("UNLOCK TABLES", ''); +// doquery("FLUSH TABLES", ''); - // Un peu de blabla pour l'utilisateur, affichage d'un joli tableau de la flotte expedi�e - $page = "
"; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; - $page .= ""; + // Un peu de blabla pour l'utilisateur, affichage d'un joli tableau de la flotte expedi�e + $page = "
"; + $page .= "
". $lang['fl_fleet_send'] ."
". $lang['fl_mission'] ."". $missiontype[$_POST['mission']] ."
". $lang['fl_dist'] ."". pretty_number($distance) ."
". $lang['fl_speed'] ."". pretty_number($_POST['speedallsmin']) ."
". $lang['fl_deute_need'] ."". pretty_number($consumption) ."
". $lang['fl_from'] ."". $_POST['thisgalaxy'] .":". $_POST['thissystem']. ":". $_POST['thisplanet'] ."
". $lang['fl_dest'] ."". $_POST['galaxy'] .":". $_POST['system'] .":". $_POST['planet'] ."
". $lang['fl_time_go'] ."". date("M D d H:i:s", $fleet['start_time']) ."
". $lang['fl_time_back'] ."". date("M D d H:i:s", $fleet['end_time']) ."
". $lang['fl_title'] ."
"; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; + $page .= ""; - foreach ($fleetarray as $Ship => $Count) { - $page .= ""; - $page .= ""; - $page .= ""; - } - $page .= "
". $lang['fl_fleet_send'] ."
". $lang['fl_mission'] ."". $missionTypes[$_POST['mission']] ."
". $lang['fl_dist'] ."". pretty_number($distance) ."
". $lang['fl_speed'] ."". pretty_number($_POST['speedallsmin']) ."
". $lang['fl_deute_need'] ."". pretty_number($consumption) ."
". $lang['fl_from'] ."". $_POST['thisgalaxy'] .":". $_POST['thissystem']. ":". $_POST['thisplanet'] ."
". $lang['fl_dest'] ."". $_POST['galaxy'] .":". $_POST['system'] .":". $_POST['planet'] ."
". $lang['fl_time_go'] ."". date("M D d H:i:s", $fleet['start_time']) ."
". $lang['fl_time_back'] ."". date("M D d H:i:s", $fleet['end_time']) ."
". $lang['fl_title'] ."
". $lang['tech'][$Ship] ."". pretty_number($Count) ."
"; + foreach ($fleetArray as $Ship => $Count) { + $page .= ""; + $page .= "". $lang['tech'][$Ship] .""; + $page .= "". pretty_number($Count) .""; + } + $page .= ""; - // Provisoire - sleep (1); + // Provisoire + sleep (1); - $planetrow = doquery ("SELECT * FROM {{table}} WHERE `id` = '". $CurrentPlanet['id'] ."';", 'planets', true); + $planetrow = doquery ("SELECT * FROM {{table}} WHERE `id` = '". $planet['id'] ."';", 'planets', true); - display($page, $lang['fl_title']); - -// Updated by Chlorel. 16 Jan 2008 (String extraction, bug corrections, code uniformisation -// Updated by -= MoF =- for Deutsches Ugamela Forum -// 06.12.2007 - 08:39 -// Open Source -// (c) by MoF - -?> \ No newline at end of file + display($page, $lang['fl_title']); diff --git a/galaxy.php b/galaxy.php index 123be8f..32392c1 100644 --- a/galaxy.php +++ b/galaxy.php @@ -50,7 +50,7 @@ require_once dirname(__FILE__) .'/common.php'; $CanDestroy = $CurrentPlanet[$resource[213]] + $CurrentPlanet[$resource[214]]; $maxfleet = doquery("SELECT * FROM {{table}} WHERE `fleet_owner` = '". $user['id'] ."';", 'fleets'); - $maxfleet_count = mysql_num_rows($maxfleet); + $maxfleet_count = $maxfleet->rowCount(); CheckPlanetUsedFields($CurrentPlanet); CheckPlanetUsedFields($lunarow); diff --git a/includes/application/code/core/Legacies.php b/includes/application/code/core/Legacies.php index ed575f7..d106886 100644 --- a/includes/application/code/core/Legacies.php +++ b/includes/application/code/core/Legacies.php @@ -216,4 +216,20 @@ class Legacies { self::$_response = $response; } + + public static function getUrl($uri, Array $params = array()) + { + // TODO: base path integration + $serializedParams = array(); + foreach ($params as $paramKey => $paramValue) { + if ($paramValue) { + $serializedParams[] = "{$paramKey}={$paramValue}"; + } + } + + if (count($serializedParams) > 0) { + return $uri . '?' . implode('&', $serializedParams); + } + return $uri; + } } \ No newline at end of file diff --git a/includes/application/code/core/Legacies/Core/Collection.php b/includes/application/code/core/Legacies/Core/Collection.php index ed3265e..b47c67d 100644 --- a/includes/application/code/core/Legacies/Core/Collection.php +++ b/includes/application/code/core/Legacies/Core/Collection.php @@ -297,7 +297,7 @@ SQL_EOF; { $clone = clone $this; $clone->_fields = array(); - $clone->column('COUNT(*)'); + $clone->column('1'); $sql = $clone->_prepareSql(); @@ -306,7 +306,10 @@ SQL_EOF; $args = func_get_args(); $statement->execute(array_shift($args)); - return $statement->fetch(PDO::FETCH_COLUMN, 0); + $count = $statement->rowCount(); + $statement->closeCursor(); + + return $count; } public function count() @@ -342,4 +345,22 @@ SQL_EOF; { return current($this->_items) !== false; } + + public function getFirstItem() + { + if (!$this->_) + if (count($this->_items) > 0) { + return $this->_items[0]; + } + return null; + } + + public function getLastItem() + { + $size = count($this->_items); + if ($size > 0) { + return $this->_items[$size - 1]; + } + return null; + } } \ No newline at end of file diff --git a/includes/application/code/core/Legacies/Core/View.php b/includes/application/code/core/Legacies/Core/View.php index a57034a..c198af5 100644 --- a/includes/application/code/core/Legacies/Core/View.php +++ b/includes/application/code/core/Legacies/Core/View.php @@ -112,18 +112,7 @@ class Legacies_Core_View public function getUrl($uri, Array $params = array()) { - // TODO: base path integration - $serializedParams = array(); - foreach ($params as $paramKey => $paramValue) { - if ($paramValue) { - $serializedParams[] = "{$paramKey}={$paramValue}"; - } - } - - if (count($serializedParams) > 0) { - return $uri . '?' . implode('&', $serializedParams); - } - return $uri; + return Legacies::getUrl($uri, $params); } public function getSkinUrl($uri) diff --git a/includes/application/code/core/Legacies/Empire/Block/Planet/Shipyard/Queue.php b/includes/application/code/core/Legacies/Empire/Block/Planet/Shipyard/Queue.php index d43af80..7bac2bc 100644 --- a/includes/application/code/core/Legacies/Empire/Block/Planet/Shipyard/Queue.php +++ b/includes/application/code/core/Legacies/Empire/Block/Planet/Shipyard/Queue.php @@ -5,7 +5,7 @@ class Legacies_Empire_Block_Planet_Shipyard_Queue { public function getQueue() { - return $this->getPlanet()->getShipyard()->getQueue(); + return $this->getPlanet()->getShipyard()->getBuilder(); } public function isEmpty() diff --git a/includes/application/code/core/Legacies/Empire/Model/Planet.php b/includes/application/code/core/Legacies/Empire/Model/Planet.php index a1688bb..186dd44 100644 --- a/includes/application/code/core/Legacies/Empire/Model/Planet.php +++ b/includes/application/code/core/Legacies/Empire/Model/Planet.php @@ -64,6 +64,56 @@ class Legacies_Empire_Model_Planet return self::$_instances[$id]; } + public static function factoryFromCoords($coords, $type = self::TYPE_PLANET) + { + if ($coords === null || empty($coords)) { + return new self(); + } + + if (!in_array($type, array(self::TYPE_PLANET, self::TYPE_DEBRIS, self::TYPE_MOON))) { + $type = self::TYPE_PLANET; + } + + if (!is_array($coords)) { + $coords = explode(':', $coords); + + if (count($coords) != 3) { + return new self(); + } + + $coords = array( + 'galaxy' => $coords[0], + 'system' => $coords[1], + 'position' => $coords[2], + 'type' => $type + ); + } + + if (!isset($coords['type'])) { + $coords['type'] = $type; + } + + $database = Legacies_Database::getSingleton(); + $collection = new Legacies_Core_Collection('planets'); + $collection + ->column('id') + ->where('galaxy=:galaxy') + ->where('system=:system') + ->where('planet=:position') + ->where('planet_type=:type') + ->limit(1) + ->load($coords) + ; + + $planetData = $collection->getFirstItem(); + + if ($planetData === null || !$planetData->getData('id')) { + return new self(); + } + + return self::factory($planetData->getData('id')); + } + public function _init() { $this->_tableName = 'planets'; diff --git a/includes/application/code/core/Legacies/Empire/Model/Planet/Builder.php b/includes/application/code/core/Legacies/Empire/Model/Planet/Builder.php index 5c5bc60..c7ac505 100644 --- a/includes/application/code/core/Legacies/Empire/Model/Planet/Builder.php +++ b/includes/application/code/core/Legacies/Empire/Model/Planet/Builder.php @@ -27,7 +27,7 @@ class Legacies_Empire_Model_Planet_Builder } if (!isset($params['started_at'])) { - $startedAt = 0; + $startedAt = null; } else { $startedAt = $params['started_at']; } @@ -128,7 +128,7 @@ class Legacies_Empire_Model_Planet_Builder foreach ($this->getQueue() as $element) { $elementTime = $element->getData('started_at'); - if ($elementTime == 0) { + if ($elementTime === null) { $element->setData('started_at', $startingTime); $elementTime = $startingTime; } @@ -199,6 +199,10 @@ class Legacies_Empire_Model_Planet_Builder return $this; } + if ($this->count() == 0) { + $this->_currentPlanet->setData('b_building', $time); + } + $this->enqueue(array( 'building_id' => $buildingId, 'level' => $level, diff --git a/includes/application/code/core/Legacies/Empire/Model/User.php b/includes/application/code/core/Legacies/Empire/Model/User.php index 1034c05..db909bf 100644 --- a/includes/application/code/core/Legacies/Empire/Model/User.php +++ b/includes/application/code/core/Legacies/Empire/Model/User.php @@ -233,11 +233,11 @@ class Legacies_Empire_Model_User */ public function updateCurrentPlanet($planet) { - if (!$planetId instanceof Legacies_Empire_Model_Planet) { + if (!$planet instanceof Legacies_Empire_Model_Planet) { $planetCollection = $this->_preparePlanetCollection()->where('id=:id'); $planetCollection->load(array( - 'id' => $planet, + 'id' => $planet, 'user' => $this->getId() )); diff --git a/includes/application/design/scripts/empire/topnav.phtml b/includes/application/design/scripts/empire/topnav.phtml index 8a4f2e4..ae8ee95 100644 --- a/includes/application/design/scripts/empire/topnav.phtml +++ b/includes/application/design/scripts/empire/topnav.phtml @@ -1,13 +1,17 @@
+
⇦
+
getPlanetCollection() as $planet):?> -
+
getId() != $this->getCurrentPlanet()->getId()):?> - escape($planet->getName())?> [escape($planet->getCoords())?>] + escape($planet->getName())?> [escape($planet->getCoords())?>] escape($planet->getName())?> [escape($planet->getCoords())?>] -
+
+
+
⇨
diff --git a/includes/constants.php b/includes/constants.php index ca56d7b..dab5e54 100644 --- a/includes/constants.php +++ b/includes/constants.php @@ -43,6 +43,8 @@ define('LEVEL_OPERATOR', 2); define('LEVEL_MODERATOR', 1); define('LEVEL_PLAYER', 0); +define('ALLOW_SPY_DRONE_ATTACKS', true); + // Nombre de colones pour les rapports d'espionnage define('SPY_REPORT_ROW', 2); diff --git a/includes/debug.class.php b/includes/debug.class.php index 669066a..c9c1f8e 100644 --- a/includes/debug.class.php +++ b/includes/debug.class.php @@ -125,33 +125,32 @@ EOF; * @param $title * @return unknown_type */ - function error($message, $title) + public function error($message, $title) { - global $link, $gameConfig; + $gameConfig = Legacies_Core_Model_Config::getSingleton(); - if($gameConfig['debug']==1){ + if ($gameConfig['debug'] == 1) { echo "

$title


$message
"; echo "".$this->log."
"; } - global $user; + $user = Legacies_Empire_Model_User::getSingleton(); + + $db = Legacies_Database::getSingleton(); $config = include ROOT_PATH . 'config.' . PHPEXT; if(!$link) die('La base de donnee n est pas disponible pour le moment, desole pour la gene occasionnee...'); - $query = "INSERT INTO {{table}} SET - `error_sender` = '{$user['id']}' , - `error_time` = '".time()."' , - `error_type` = '{$title}' , - `error_text` = '".mysql_escape_string($message)."';"; - $sqlquery = mysql_query(str_replace("{{table}}", $dbsettings["prefix"].'errors',$query)) - or die('error fatal'); - $query = "explain select * from {{table}}"; - $q = mysql_fetch_array(mysql_query(str_replace("{{table}}", $dbsettings["prefix"]. - 'errors', $query))) or die('error fatal: '); + $query = "INSERT INTO {$db->getTable('errors')} SET + `error_sender` = {$user->getId()} , + `error_time` = {$db->quote(time())}, + `error_type` = {$db->quote($title)}, + `error_text` = {$db->quote($message)}"; + $db->query($query); + $id = $db->lastInsertId($db->getTable('errors')); if (!function_exists('message')) { - echo "Erreur, merci de contacter l'admin. Erreur n�: ".$q['rows'].""; + echo "Erreur, merci de contacter l'admin. Erreur n�: ".$id.""; } else { - message("Erreur, merci de contacter l'admin. Erreur n�: ".$q['rows']."", "Erreur"); + message("Erreur, merci de contacter l'admin. Erreur n�: ".$id."", "Erreur"); } } } diff --git a/includes/functions/BuildFlyingFleetTable.php b/includes/functions/BuildFlyingFleetTable.php index 5ce94a7..bcc97db 100644 --- a/includes/functions/BuildFlyingFleetTable.php +++ b/includes/functions/BuildFlyingFleetTable.php @@ -37,7 +37,7 @@ function BuildFlyingFleetTable () { $TableTPL = gettemplate('admin/fleet_rows'); $FlyingFleets = doquery ("SELECT * FROM {{table}} ORDER BY `fleet_end_time` ASC;", 'fleets'); - while ( $CurrentFleet = mysql_fetch_assoc( $FlyingFleets ) ) { + while ( $CurrentFleet = $FlyingFleets->fetch(PDO::FETCH_ASSOC) ) { $FleetOwner = doquery("SELECT `username` FROM {{table}} WHERE `id` = '". $CurrentFleet['fleet_owner'] ."';", 'users', true); $TargetOwner = doquery("SELECT `username` FROM {{table}} WHERE `id` = '". $CurrentFleet['fleet_target_owner'] ."';", 'users', true); $Bloc['Id'] = $CurrentFleet['fleet_id']; diff --git a/includes/functions/DeleteSelectedUser.php b/includes/functions/DeleteSelectedUser.php index 42b0b0b..5be77bb 100644 --- a/includes/functions/DeleteSelectedUser.php +++ b/includes/functions/DeleteSelectedUser.php @@ -50,7 +50,7 @@ function DeleteSelectedUser ( $UserID ) { doquery ( "DELETE FROM {{table}} WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';", 'statpoints' ); $ThePlanets = doquery ( "SELECT * FROM {{table}} WHERE `id_owner` = '" . $UserID . "';", 'planets' ); - while ( $OnePlanet = mysql_fetch_assoc ( $ThePlanets ) ) { + while ( $OnePlanet = $ThePlanets->fetch(PDO::FETCH_ASSOC) ) { if ( $OnePlanet['planet_type'] == 1 ) { doquery ( "DELETE FROM {{table}} WHERE `galaxy` = '" . $OnePlanet['galaxy'] . "' AND `system` = '" . $OnePlanet['system'] . "' AND `planet` = '" . $OnePlanet['planet'] . "';", 'galaxy' ); } elseif ( $OnePlanet['planet_type'] == 3 ) { diff --git a/includes/functions/MissionCaseColonisation.php b/includes/functions/MissionCaseColonisation.php index de8145a..92c975e 100644 --- a/includes/functions/MissionCaseColonisation.php +++ b/includes/functions/MissionCaseColonisation.php @@ -36,10 +36,12 @@ function MissionCaseColonisation ( $FleetRow ) { global $lang, $resource; - $iPlanetCount = mysql_result(doquery ("SELECT count(*) FROM {{table}} WHERE `id_owner` = '". $FleetRow['fleet_owner'] ."' AND `planet_type` = '1'", 'planets'), 0); + $statement = doquery ("SELECT count(*) FROM {{table}} WHERE `id_owner` = '". $FleetRow['fleet_owner'] ."' AND `planet_type` = '1'", 'planets'); + $iPlanetCount = $statement->fetch(PDO::FETCH_ASSOC); if ($FleetRow['fleet_mess'] == 0) { // Déjà, sommes nous a l'aller ?? - $iGalaxyPlace = mysql_result(doquery ("SELECT count(*) FROM {{table}} WHERE `galaxy` = '". $FleetRow['fleet_end_galaxy']."' AND `system` = '". $FleetRow['fleet_end_system']."' AND `planet` = '". $FleetRow['fleet_end_planet']."';", 'galaxy'), 0); + $statement2 = doquery ("SELECT count(*) FROM {{table}} WHERE `galaxy` = '". $FleetRow['fleet_end_galaxy']."' AND `system` = '". $FleetRow['fleet_end_system']."' AND `planet` = '". $FleetRow['fleet_end_planet']."';", 'galaxy'); + $iGalaxyPlace = $statement2->fetch(PDO::FETCH_ASSOC); $TargetAdress = sprintf ($lang['sys_adress_planet'], $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']); if ($iGalaxyPlace == 0) { // Y a personne qui s'y est mis avant que je ne debarque ! diff --git a/includes/unlocalised.php b/includes/unlocalised.php index 82244dd..eff4997 100644 --- a/includes/unlocalised.php +++ b/includes/unlocalised.php @@ -63,38 +63,51 @@ function GetGameSpeedFactor () { * Calcul de la vitesse de la flotte par rapport aux technos du joueur * Avec prise en compte */ -function GetFleetMaxSpeed ($FleetArray, $Fleet, $Player) { +function GetFleetMaxSpeed($FleetArray, $Fleet, $Player) { global $reslist, $pricelist; + if (!is_array($FleetArray)) { + $FleetArray = array(); + } + if ($Fleet != 0) { $FleetArray[$Fleet] = 1; } + + $speedalls = array(); foreach ($FleetArray as $Ship => $Count) { - if ($Ship == 202) { + if ($Ship == Legacies_Empire::ID_SHIP_SOLAR_SATELLITE) { + $speedalls[$Ship] = 0; + } + if ($Ship == Legacies_Empire::ID_SHIP_LIGHT_TRANSPORT) { if ($Player['impulse_motor_tech'] >= 5) { $speedalls[$Ship] = $pricelist[$Ship]['speed2'] + (($pricelist[$Ship]['speed'] * $Player['impulse_motor_tech']) * 0.2); } else { $speedalls[$Ship] = $pricelist[$Ship]['speed'] + (($pricelist[$Ship]['speed'] * $Player['combustion_tech']) * 0.1); } } - if ($Ship == 203 or $Ship == 204 or $Ship == 209 or $Ship == 210) { + if ($Ship == Legacies_Empire::ID_SHIP_LARGE_TRANSPORT || $Ship == Legacies_Empire::ID_SHIP_LIGHT_FIGHTER || + $Ship == Legacies_Empire::ID_SHIP_RECYCLER || $Ship == Legacies_Empire::ID_SHIP_SPY_DRONE) { $speedalls[$Ship] = $pricelist[$Ship]['speed'] + (($pricelist[$Ship]['speed'] * $Player['combustion_tech']) * 0.1); } - if ($Ship == 205 or $Ship == 206 or $Ship == 208) { + if ($Ship == Legacies_Empire::ID_SHIP_HEAVY_FIGHTER || $Ship == Legacies_Empire::ID_SHIP_CRUISER || + $Ship == Legacies_Empire::ID_SHIP_COLONY_SHIP) { $speedalls[$Ship] = $pricelist[$Ship]['speed'] + (($pricelist[$Ship]['speed'] * $Player['impulse_motor_tech']) * 0.2); } - if ($Ship == 211) { + if ($Ship == Legacies_Empire::ID_SHIP_BOMBER) { if ($Player['hyperspace_motor_tech'] >= 8) { $speedalls[$Ship] = $pricelist[$Ship]['speed2'] + (($pricelist[$Ship]['speed'] * $Player['hyperspace_motor_tech']) * 0.3); } else { $speedalls[$Ship] = $pricelist[$Ship]['speed'] + (($pricelist[$Ship]['speed'] * $Player['impulse_motor_tech']) * 0.2); } } - if ($Ship == 207 or $Ship == 213 or $Ship == 214 or $Ship == 215 or $Ship == 216) { + if ($Ship == Legacies_Empire::ID_SHIP_BATTLESHIP || $Ship == Legacies_Empire::ID_SHIP_DESTRUCTOR || + $Ship == Legacies_Empire::ID_SHIP_DEATH_STAR || $Ship == Legacies_Empire::ID_SHIP_BATTLECRUISER || + $Ship == Legacies_Empire::ID_SHIP_SUPERNOVA) { $speedalls[$Ship] = $pricelist[$Ship]['speed'] + (($pricelist[$Ship]['speed'] * $Player['hyperspace_motor_tech']) * 0.3); } } - if ($Fleet != 0) { + if ($Fleet != 0 && isset($speedalls[$Ship])) { $ShipSpeed = $speedalls[$Ship]; $speedalls = $ShipSpeed; } diff --git a/install/index.php b/install/index.php index 2fa9c2d..f2619ac 100644 --- a/install/index.php +++ b/install/index.php @@ -1,6 +1,6 @@ rowCount() == 1) { $planet = mysql_fetch_array($planet_start); } @@ -197,7 +197,7 @@ if (isset($_POST) && !empty($_POST)) { $newMessages = new Legacies_Core_View(); $newMessages->setTemplate('empire/overview/messages.phtml'); $newMessages['count'] = (int) $count; - + /** Gestion des officiers * Update miner and raider level * @@ -220,7 +220,7 @@ if (isset($_POST) && !empty($_POST)) { $user->setData('rpg_points', $user->getData('rpg_points') +1); $user->save(); } - + /** * Page display * Refactoring needed diff --git a/phalanx.php b/phalanx.php index 7fd032a..cc280f3 100644 --- a/phalanx.php +++ b/phalanx.php @@ -81,7 +81,7 @@ require_once dirname(__FILE__) .'/common.php'; $FleetToTarget = doquery( $QryLookFleets, 'fleets' ); - if (mysql_num_rows($FleetToTarget) <> 0 ) { + if ($FleetToTarget->rowCount() > 0 ) { while ($FleetRow = $FleetToTarget->fetch(PDO::FETCH_BOTH)) { $Record++; diff --git a/rak.php b/rak.php index 6fdf912..125877e 100644 --- a/rak.php +++ b/rak.php @@ -53,12 +53,12 @@ if (isset($resource) && !empty($resource[401])) { $select_owner = doquery("SELECT military_tech FROM {{table}} WHERE id = '" . $selected_row['owner'] . "'", 'users'); - if (mysql_num_rows($planetrow) != 1 OR mysql_num_rows($select_ziel) != 1) { + if ($planetrow->rowCount() != 1 || $select_ziel->rowCount() != 1) { doquery("DELETE FROM {{table}} WHERE id = '" . $selected_row['id'] . "'", 'iraks'); } else { - $verteidiger = mysql_fetch_array($select_ziel); - $angreifer = mysql_fetch_array($select_owner); - $planet = mysql_fetch_array($planetrow); + $verteidiger = $select_ziel->fetch(PDO::FETCH_BOTH); + $angreifer = $select_owner->fetch(PDO::FETCH_BOTH); + $planet = $planetrow->fetch(PDO::FETCH_BOTH); $ids = array(0 => 401, 1 => 402, @@ -136,7 +136,7 @@ if (isset($resource) && !empty($resource[401])) { system = '" . $selected_row['system_angreifer'] . "' AND planet = '" . $selected_row['planet_angreifer'] . "'", 'planets'); - if (mysql_num_rows($planet_) == 1) { + if ($planet_->rowCount() == 1) { $array = mysql_fetch_array($planet_); $name = $array['name']; @@ -147,7 +147,7 @@ if (isset($resource) && !empty($resource[401])) { system = '" . $selected_row['system'] . "' AND planet = '" . $selected_row['planet'] . "'", 'planets'); - if (mysql_num_rows($planet_2) == 1) { + if ($planet_2->rowCount() == 1) { $array = mysql_fetch_array($planet_2); $name_deffer = $array['name']; diff --git a/raketenangriff.php b/raketenangriff.php index f76f8b7..6843dc7 100644 --- a/raketenangriff.php +++ b/raketenangriff.php @@ -65,7 +65,7 @@ elseif ($user['impulse_motor_tech'] == 0) {; elseif ($tempvar1 >= $tempvar2 || $g != $currentplanet['galaxy']) { $error = 1; } -elseif (mysql_num_rows($tempvar3) != 1) { +elseif ($tempvar3->rowCount() != 1) { $error = 1; } elseif ($anz > $iraks) { diff --git a/reg.php b/reg.php index 6070fc9..2d2dbdf 100644 --- a/reg.php +++ b/reg.php @@ -53,7 +53,8 @@ if (!empty($_POST) && isset($_POST['username']) && isset($_POST['planet_name']) if ($user !== null && $user->getId()) { header("HTTP/1.1 302 Found"); - header("Location: welcome.php"); + //header("Location: welcome.php"); + header("Location: frames.php"); } else { header("HTTP/1.1 302 Found"); header("Location: reg.php"); diff --git a/scripts/flotten.js b/scripts/flotten.js index cccd8be..7169506 100644 --- a/scripts/flotten.js +++ b/scripts/flotten.js @@ -52,10 +52,10 @@ function min(a, b) { function maxspeed() { var msp = 1000000000; for (i = 200; i < 220; i++) { - if (document.getElementsByName("ship" + i)[0]) { - if ((document.getElementsByName("speed" + i)[0].value * 1) >= 1 - && (document.getElementsByName("ship" + i)[0].value * 1) >= 1) { - msp = min(msp, document.getElementsByName("speed" + i)[0].value); + if (document.getElementsByName("ship[" + i + "]")[0]) { + if ((document.getElementsByName("speed[" + i + "]")[0].value * 1) >= 1 + && (document.getElementsByName("ship[" + i + "]")[0].value * 1) >= 1) { + msp = min(msp, document.getElementsByName("speed[" + i + "]")[0].value); } } } @@ -113,10 +113,10 @@ function consumption2() { var basicConsumption = 0; for (i = 200; i < 220; i++) { - if (document.getElementsByName("ship" + i)[0]) { + if (document.getElementsByName("ship[" + i + "]")[0]) { basicConsumption = basicConsumption + - document.getElementsByName("consumption" + i)[0].value - * document.getElementsByName("ship" + i)[0].value; + document.getElementsByName("consumption[" + i + "]")[0].value + * document.getElementsByName("ship[" + i + "]")[0].value; } } @@ -143,16 +143,16 @@ function consumption() { speedfactor = document.getElementsByName("speedfactor")[0].value; for (i = 200; i < 220; i++) { - if (document.getElementsByName("ship" + i)[0]) { - shipspeed = document.getElementsByName("speed" + i)[0].value; + if (document.getElementsByName("ship[" + i + "]")[0]) { + shipspeed = document.getElementsByName("speed[" + i + "]")[0].value; spd = 35000 / (dur * speedfactor - 10) * Math.sqrt(dist * 10 / shipspeed); //spd = Math.max(msp / document.getElementsByName("speed" + i)[0].value, 0.1); //spd = Math.min(spd, 1.0); //spd = spd * sp; //spd = 10; - basicConsumption = document.getElementsByName("consumption" + i)[0].value - * document.getElementsByName("ship" + i)[0].value; + basicConsumption = document.getElementsByName("consumption[" + i + "]")[0].value + * document.getElementsByName("ship[" + i + "]")[0].value; consumption += basicConsumption * dist / 35000 * ((spd / 10) + 1) * ((spd / 10) + 1); // values = values + " " + spd; } @@ -208,11 +208,11 @@ function storage() { for (i = 200; i < 300; i++) { - if (document.getElementsByName("ship" + i)[0]) { - if ((document.getElementsByName("ship" + i)[0].value * 1) >= 1) { + if (document.getElementsByName("ship[" + i + "]")[0]) { + if ((document.getElementsByName("ship[" + i + "]")[0].value * 1) >= 1) { storage - += document.getElementsByName("ship" + i)[0].value - * document.getElementsByName("capacity" + i)[0].value + += document.getElementsByName("ship[" + i + "]")[0].value + * document.getElementsByName("capacity[" + i + "]")[0].value } } } @@ -359,7 +359,7 @@ function maxShip(id) { function maxShips() { var id; for (i = 200; i < 220; i++) { - id = "ship"+i; + id = "ship["+i+"]"; maxShip(id); } } @@ -375,7 +375,7 @@ function noShip(id) { function noShips (){ var id; for (i = 200; i < 220; i++) { - id = "ship"+i; + id = "ship["+i+"]"; noShip(id); } } diff --git a/search.php b/search.php index 04a8a96..4623b25 100644 --- a/search.php +++ b/search.php @@ -74,7 +74,7 @@ switch($type){ */ if(isset($searchtext) && isset($type)){ - while($r = mysql_fetch_array($search, MYSQL_BOTH)){ + while($r = $search->fetch(PDO::FETCH_BOTH)){ if($type=='playername'||$type=='planetname'){ $s=$r; diff --git a/skin/default/css/deprecated/about.css b/skin/default/css/deprecated/about.css index cd21fb5..c5b5d1b 100644 --- a/skin/default/css/deprecated/about.css +++ b/skin/default/css/deprecated/about.css @@ -1,5 +1,5 @@ /** - * Tis file is part of XNova:Legacies + * This file is part of XNova:Legacies * * @license http://www.gnu.org/licenses/gpl-3.0.txt * @see http://www.xnova-ng.org/ diff --git a/skin/default/css/deprecated/default.css b/skin/default/css/deprecated/default.css index b9d6d8d..b4820bc 100644 --- a/skin/default/css/deprecated/default.css +++ b/skin/default/css/deprecated/default.css @@ -1,31 +1,3 @@ -.allymember { - color: lime; -} - -.noob { - color: #a0ffa0; -} - -.strong { - color: #ffa0a0; -} - -.vacation { - color: skyblue; -} - -.inactive { - color: CCCCCC; -} - -.longinactive { - color: 999999; -} - -.banned { - text-decoration: line-through; -} - .flight { } diff --git a/skin/default/css/deprecated/formate.css b/skin/default/css/deprecated/formate.css index 6625d38..9088598 100644 --- a/skin/default/css/deprecated/formate.css +++ b/skin/default/css/deprecated/formate.css @@ -10,21 +10,10 @@ __ __ _ _ */ -., #, td, th, textarea, body, table -{ - font-family : Tahoma,sans-serif; - font-size : 10px; -} +* {font-family:Tahoma,sans-serif;font-size:10px;} -img -{ - border : 0px; -} - -p table -{ - border : 0px; -} +img {border:none;} +p table {border:none;} p td { @@ -33,78 +22,29 @@ p td font-family : Tahoma,sans-serif; } -table table -{ - border : 0px; -} +table table {border:0px;} -table table td -{ - font-size : 10px; - font-family : Tahoma,sans-serif; -} +body {color:#000;margin:1px 0 0 1px;background:#040e1e url(../../graphics/img/background2.jpg) fixed no-repeat top left;} -body -{ - color : #FFFFFF; - margin-top : 1px; - margin-left : 1px; - background-color : #040e1e; - background-image : url(img/background2.jpg); - background-attachment: fixed; - background-repeat : no-repeat; - background-position : top left; - scrollbar-arrow-color: #FFFFFF; - scrollbar-base-color: #344566; - scrollbar-track-color: #344566; - scrollbar-face-color: #344566; - scrollbar-highlight-color: #344566; - scrollbar-3dlight-color: #465673; - scrollbar-darkshadow-color: #344566; - scrollbar-shadow-color: #465673; - font-size : 10px; - font-family : Tahoma,sans-serif; -} +body.style {background-image:url(../../graphics/img/background1.jpg);} +body.style table {margin:0px;border:0 auto} +body form table th table input {width: 60px;} -body.style{ - background-image : url(img/background1.jpg); -} - -body.style table { - margin : 0px; -} - -body form table th table input -{ - width: 60px; -} +.content table {margin:0 auto;} th, td.a, td.b, td.c, td.f, td.g, td.h, td.i, td.j, td.k, td.l, td.m, td.n, td.o, td.q, td.r, td.v, .style td, p td, table.s th img { border : 1px #545454 solid; - font-size : 10px; - font-family : Tahoma,sans-serif; } input, select, textarea { border : 1px #545454 solid; - font-size : 10px; - font-family : Tahoma,sans-serif; } -th, td.a, td.b, td.c, td.f, input, select, td.g, -td.h, td.i, td.j, td.k, td.m, td.o, td.q, td.r, -td.v, td.s, .style td, p td -{ - background-color : #000000; - filter : alpha(opacity=70); - -moz-opacity : 0.7; - -khtml-opacity : 0.7; - opacity : 0.7; -} +th, td.a,td.b,td.c,td.f,input,select,td.g,td.h,td.i,td.j,td.k,td.m,td.o,td.q,td.r,td.v,td.s,.style td,p td {background:#FFF;filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;} th { @@ -130,7 +70,7 @@ td.c color : #FFFFFF; padding-left : 3px; background-image : url(img/bg1.gif); - filter : alpha(opacity=70); + filter : alpha(opacity=90); -moz-opacity : 0.7; -khtml-opacity : 0.7; opacity : 0.7; @@ -140,7 +80,7 @@ td.f, input, select, textarea { color : #FFFFFF; background-color : #1c1c1c; - filter : alpha(opacity=70); + filter : alpha(opacity=90); -moz-opacity : 0.7; -khtml-opacity : 0.7; opacity : 0.7; @@ -265,24 +205,24 @@ div.z { font-size : 10px; font-weight : bold; - color : #FFFFFF; + color : #000; } a { - color : #FFFFFF; + color : #000; text-decoration : none; font-weight : bold; } a.s { - color : #FFFFFF; + color : #000; } a.t { - color : #FFFFFF; + color : #000; } a:hover diff --git a/skin/default/css/deprecated/styles.css b/skin/default/css/deprecated/styles.css index 55d3635..152c17a 100644 --- a/skin/default/css/deprecated/styles.css +++ b/skin/default/css/deprecated/styles.css @@ -1,5 +1,5 @@ /** - * Tis file is part of XNova:Legacies + * This file is part of XNova:Legacies * * @license http://www.gnu.org/licenses/gpl-3.0.txt * @see http://www.xnova-ng.org/ diff --git a/skin/default/css/legacies.css b/skin/default/css/legacies.css index 45b6f6a..1e53e26 100644 --- a/skin/default/css/legacies.css +++ b/skin/default/css/legacies.css @@ -1,5 +1,12 @@ @CHARSET "UTF-8"; -.global .content .resources-display {width:770px;height:40px;margin:0 auto 30px;padding:0 50px;color:#000;background:#FFF;box-shadow:0 -4px 6px #156 inset;border:1px solid #FFF;border-top:none;border-radius: 0 0 20px 20px;} + +.global .content .planet-carrousel {width:950px;height:100px;margin:0 auto;padding:0 30px;color:#000;background:#FFF;border:1px solid #FFF;border-top:none;box-shadow:0 -4px 8px #115566 inset, 20px 20px 40px #115566, -20px 20px 40px #115566, 0 -20px 40px #115566;border-bottom-left-radius:50px;border-bottom-right-radius:50px;} +.global .content .planet-carrousel .items {width:900px;height:100px;overflow:hidden;float:left;} +.global .content .planet-carrousel .arrow {height:40px;width:25px;float:left;font-size:20px;font-weight:bold;margin:30px 0;} +.global .content .planet-carrousel .planet {color:#000;height:100px;width:100px;float:left;} +.global .content .planet-carrousel .planet a {color:#000;} + +.global .content .resources-display {width:770px;height:40px;margin:0 auto 30px;padding:0 50px;color:#000;background:#FFF;box-shadow:0 -4px 6px #115566 inset, 0 20px 40px #115566;border:1px solid #FFF;border-top:none;border-radius: 0 0 20px 20px;} .global .content .resources-display .resource,.global .content .resources-display .messages {height:22px;float:left;width:140px;margin:7px 0;} .global .content .resources-display .resource img,.global .content .resources-display .messages img {float:left;} .global .content .resources-display .resource p,.global .content .resources-display .messages p {font-weight:bold;font-size:12px;margin:2px 0 2px 47px;} @@ -8,15 +15,25 @@ .global .content .resources-display .messages {height:22px;float:left;width:160px;} .global .content .resources-display .energy {width:190px;} - .global .content .queue {width:600px;margin:10px auto 0;background:#FFF;color:#000;border:1px solid #FFF;border-radius:5px;border-top-left-radius:20px;border-top-right-radius:20px;box-shadow:0 4px 6px #156 inset;} .global .content .queue h1 {color:#000;margin:10px 15px;width:570px;text-align:center;border-bottom:5px solid #9BC;} .global .content .queue .item {width:580px;margin:0 10px;border:0;box-shadow:none;border-radius:0;} .global .content .queue .item,.global .content .queue .item * {color:#000;} -.global .content .item-list {width:800px; margin:10px auto 0;background:#FFF;color:#000;border:1px solid #FFF;border-radius:5px;border-top-left-radius:20px;border-top-right-radius:20px;box-shadow:0 4px 6px #156 inset;} +.global .content .item-list {width:800px; margin:10px auto 0;background:#FFF;color:#000;border:1px solid #FFF;border-radius:5px;border-top-left-radius:20px;border-top-right-radius:20px;box-shadow:0 -4px 8px #115566 inset, 20px 20px 40px #115566, -20px 20px 40px #115566, 0 -20px 40px #115566;} .global .content .item-list h1 {color:#000;margin:10px 15px;width:770px;text-align:center;border-bottom:5px solid #9BC;} .global .content .item-list .item {width:780px;margin:0 10px;border:0;box-shadow:none;border-radius:0;} -.global .content .item-list .item,.global .content .item-list .item * {color:#000;} \ No newline at end of file +.global .content .item-list .item,.global .content .item-list .item * {color:#000;} + +/** + * Galaxy user name display colors + */ +.allymember {color:lime;} +.noob {color:darkgreen;} +.strong {color:darkred;} +.vacation {color:lightblue;} +.inactive {color:grey;} +.longinactive {color:darkgrey;} +.banned {color:red;text-decoration:line-through;} diff --git a/verband.php b/verband.php index 91632b4..0ddb1f6 100644 --- a/verband.php +++ b/verband.php @@ -42,7 +42,7 @@ require_once dirname(__FILE__) .'/common.php'; $query = doquery("SELECT * FROM {{table}} WHERE fleet_id = '" . $fleetid . "'", 'fleets'); - if (mysql_num_rows($query) != 1) { + if ($query->rowCount() != 1) { message('Cette flotte n\'existe pas (ou plus)!', 'Erreur'); } @@ -104,10 +104,9 @@ require_once dirname(__FILE__) .'/common.php'; id = '" . $fleet['fleet_group'] . "'" , 'aks'); - if (mysql_num_rows($aks) != 1) { + if ($aks->rowCount() != 1) { message('AKS nicht gefunden!', 'Fehler'); } - $aks = mysql_num_rows($aks); } $missiontype = array(1 => 'Attaquer',