Games/wootook-reloaded
Watch
1
0
Fork
You've already forked wootook-reloaded
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated install and fixed bugs

Browse source 
Added session messages display
Fixed field and validator loading.
Updated form validation
Updated root config management
Muted error reporting in file evaluation
Added menu updates
Fixed galaxy data access error
Fixed config bug
Added HTTP request method checks
Added Form manager
Fixed core bugs

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
This commit is contained in:
Gregory PLANCHAT 2011-11-08 08:56:53 +01:00
commit 9636b4bb00
69 changed files with 2434 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

16
includes/deprecated.php
View file

@ -503,11 +503,15 @@ class Deprecated
/**
* @return Wootook_Core_Layout
*/
public static function getLayout()
public static function getLayout($adminPage = false)
{
if (self::$layout === null) {
self::$layout = new Wootook_Core_Layout();
self::$layout->load('empire');
if (defined('IN_INSTALL')) {
self::$layout->setPackage('install');
self::$layout->setTheme('default');
}
}
return self::$layout;
@ -528,7 +532,13 @@ function display($page, $title = '', $topnav = true, $metatags = '', $adminPage
defined('DEPRECATION') || trigger_error(sprintf('%s is deprecated', __FUNCTION__), E_USER_DEPRECATED);
// TODO: implement extra meta tags
$layout = Deprecated::getLayout();
$layout = Deprecated::getLayout($adminPage);
if ($adminPage === false) {
$layout->load('empire');
} else {
$layout->load('admin');
}
$content = $layout->getBlock('content');
if ($topnav) {

8
includes/functions/GalaxyRowAlly.php
View file

@ -63,17 +63,17 @@ function GalaxyRowAlly ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy,
$Result .= " onmouseover='return overlib(\"";
$Result .= "<table width=240>";
$Result .= "<tr>";
$Result .= "<td class=c>".$lang['Alliance']." ". $allyquery['ally_name'] ." ".$lang['gl_with']." ". $members_count[0] ." ". $lang['gl_membre'] . $add ."</td>";
$Result .= "<td class=c>".htmlspecialchars($lang['Alliance'], ENT_QUOTES, 'UTF-8')." ". htmlspecialchars($allyquery['ally_name'], ENT_QUOTES, 'UTF-8') ." ".$lang['gl_with']." ". $members_count[0] ." ". $lang['gl_membre'] . $add ."</td>";
$Result .= "</tr>";
$Result .= "<th>";
$Result .= "<table>";
$Result .= "<tr>";
$Result .= "<td><a href=alliance.php?mode=ainfo&a=". $allyquery['id'] .">".$lang['gl_ally_internal']."</a></td>";
$Result .= "<td><a href=alliance.php?mode=ainfo&a=". intval($allyquery['id']) .">".$lang['gl_ally_internal']."</a></td>";
$Result .= "</tr><tr>";
$Result .= "<td><a href=stat.php?start=101&who=ally>".$lang['gl_stats']."</a></td>";
if ($allyquery["ally_web"] != "") {
$Result .= "</tr><tr>";
$Result .= "<td><a href=". $allyquery["ally_web"] ." target=_new>".$lang['gl_ally_web']."</td>";
$Result .= "<td><a href=". htmlspecialchars($allyquery["ally_web"], ENT_QUOTES, 'UTF-8') ." target=_new>".$lang['gl_ally_web']."</td>";
}
$Result .= "</tr>";
$Result .= "</table>";
@ -82,7 +82,7 @@ function GalaxyRowAlly ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy,
$Result .= ", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );'";
$Result .= " onmouseout='return nd();'>";
if ($user['ally_id'] == $GalaxyRowUser['ally_id']) {
$Result .= "<span class=\"allymember\">". $allyquery['ally_tag'] ."</span></a>";
$Result .= "<span class=\"allymember\">". htmlspecialchars($allyquery['ally_tag'], ENT_QUOTES, 'UTF-8') ."</span></a>";
} else {
$Result .= $allyquery['ally_tag'] ."</a>";
}

42
includes/todofleetcontrol.php
View file

@ -48,25 +48,17 @@ include(ROOT_PATH . 'includes/functions/SendSimpleMessage.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/SpyTarget.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/RestoreFleetToPlanet.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/StoreGoodsToPlanet.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/CheckPlanetBuildingQueue.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/CheckPlanetUsedFields.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/CreateOneMoonRecord.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/CreateOnePlanetRecord.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/CreateOneMoonRecord.'.PHPEXT); // <- TODO: delete
include(ROOT_PATH . 'includes/functions/CreateOnePlanetRecord.'.PHPEXT); // <- TODO: delete
include(ROOT_PATH . 'includes/functions/InsertJavaScriptChronoApplet.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/IsTechnologieAccessible.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/GetBuildingTime.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/GetBuildingTimeLevel.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GetRestPrice.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/GetElementPrice.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/GetBuildingPrice.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/IsTechnologieAccessible.'.PHPEXT); // <- TODO: delete
include(ROOT_PATH . 'includes/functions/GetRestPrice.'.PHPEXT); // <- TODO: delete
include(ROOT_PATH . 'includes/functions/IsElementBuyable.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/CheckCookies.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/ChekUser.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/InsertGalaxyScripts.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GalaxyCheckFunctions.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/ShowGalaxyRows.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GetPhalanxRange.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GetMissileRange.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GetPhalanxRange.'.PHPEXT); // <- TODO: delete
include(ROOT_PATH . 'includes/functions/GetMissileRange.'.PHPEXT); // <- TODO: delete
include(ROOT_PATH . 'includes/functions/GalaxyRowPos.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GalaxyRowPlanet.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GalaxyRowPlanetName.'.PHPEXT);
@ -80,30 +72,8 @@ include(ROOT_PATH . 'includes/functions/ShowGalaxyMISelector.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/ShowGalaxyTitles.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/GalaxyLegendPopup.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/ShowGalaxyFooter.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/GetMaxConstructibleElements.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/GetElementRessources.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/ElementBuildListBox.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/ElementBuildListQueue.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/FleetBuildingPage.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/DefensesBuildingPage.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/ResearchBuildingPage.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/BatimentBuildingPage.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/CheckLabSettingsInQueue.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/InsertBuildListScript.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/AddBuildingToQueue.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/ShowBuildingQueue.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/HandleTechnologieBuild.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/BuildingSavePlanetRecord.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/BuildingSaveUserRecord.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/RemoveBuildingFromQueue.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/CancelBuildingFromQueue.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/SetNextQueueElementOnTop.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/ShowTopNavigationBar.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/SetSelectedPlanet.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/MessageForm.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/BuildFlyingFleetTable.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/SendNewPassword.'.PHPEXT);
//include(ROOT_PATH . 'includes/functions/UpdatePlanetBatimentQueueList.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/IsOfficierAccessible.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/CheckInputStrings.'.PHPEXT);
include(ROOT_PATH . 'includes/functions/MipCombatEngine.'.PHPEXT);