Merge branch 'master' of git://github.com/Freelander/xlrstats-web-v2.git

Fixed Conflicts:
	xlrstats/xlrstats/config/homefront.php

xlrstats/xlrstats/config/distro-config.php

@@ -34,7 +34,7 @@
 $db_pass = "";
 $db_db = "";
 
-// What game? (urt, cod1, coduo, cod2, cod4, codwaw, cod6, cod7, wop, smg, bfbc2)
+// What game? (urt, cod1, coduo, cod2, cod4, codwaw, cod6, cod7, wop, smg, bfbc2, homefront)
 $game = "none";
 $public_ip = "0.0.0.0:27960";
 // This is the path where B3 stores the status.xml file. May be an absolute path or an URL. (Use forward slashes / only!)

xlrstats/xlrstats/config/homefront.php

@@ -1,7 +1,7 @@
 <?php
 /***************************************************************************
  * Xlrstats Webmodule
- * Webfront for XLRstats for B3 (www.bigbrotherbot.com)
+ * Webrfront for XLRstats for B3 (www.bigbrotherbot.com)
  * (c) 2004-2010 www.xlr8or.com (mailto:xlr8or@xlr8or.com)
  ***************************************************************************/
 
@@ -23,38 +23,148 @@
  *  http://www.gnu.org/copyleft/gpl.html
  ***************************************************************************/
 
-//*********************
-// These are the standard MOH settings
-//*********************
+//*******************************
+// Standard Homefront Settings
+//*******************************
 
 // Teamnames and colors
-$team1 = "Korea"; // red team
-$team2 = "U.S."; // blue team
+$team1 = "KPA"; // red team
+$team2 = "USA"; // blue team
 $spectators = "Spectators";
 
+//*********************
+// Weapons
+//*********************
+
+//*********************
+//Assault Rifles
+//*********************
+
+$w['RIF_M4'] = "M4 Rifle";
+$w['RIF_ACR'] = "ACR Rifle";
+$w[''] = "SCAR-L Rifle";
+$w['RIF_M16'] = "M16 Rifle";
+$w['RIF_T3AK'] = "T3AK Rifle";
+$w[''] = "XM10 Rifle";
+
+//*********************
+//Sub Machine Guns
+//*********************
+
+$w['SMG_DIABLO'] = "PWS Diablo SMG";
+$w[''] = "Super V SMG";
+
+//*********************
+//Light Machine Guns
+//*********************
+
+$w['LMG_M249'] = "M249 LMG";
+$w['LMG_SCARMG'] = "SCAR-H LMG";
+
+//*********************
+//Sniper Rifles
+//*********************
+
+$w['SNI_M110'] = "M110 Sniper Rifle";
+$w[''] = "M200 Sniper Rifle";
+
+//*********************
+//Side Arms
+//*********************
+
+$w['PST_M9'] = "M9";
+
+//*********************
+//Downloadable Guns
+//*********************
+
+$w[''] = "870 Express Shotgun";
+
+//*********************
+//Explosives
+//*********************
+
+$w['EXP_Frag'] = "Grenade";
+$w[''] = "EMP Grenade";
+$w[''] = "Flashbang";
+$w['EXP_C4'] = "C4";
+$w['PhosphorusFire'] = "White Phosphorus Grenade";
+
+//*********************
+//Drones
+//*********************
+
+$w[''] = "MQ50 MG Wolverine";
+$w[''] = "AQ-11 Buzzard";
+$w[''] = "RQ-10 Parrot";
+$w[''] = "MQ60 AT Rhino";
+
+
+//*********************
+//Airstrikes
+//*********************
+
+$w['EXP_Hellfire'] = "Hellfire";
+$w[''] = "Cluster Bomb";
+$w[''] = "White Phosphorus";
 
 //*********************
-// Weapons names
+//Rocket Launchers
 //*********************
 
-//Rifleman
-$w['[]'] = $text["notidentify"];
+$w[''] = "RPG Launcher";
+$w['ATW_PROX'] = "Proximity Launcher";
+
+//*********************
+// Wehicles
+//*********************
+
+//Humvee
+$w['M1114_Seat1_Bullet'] = "M1151 Humvee";
+
+//Light Armor Vehicles
+$w['LAV_Seat0_Bullet'] = "LAV Piranha";
+
+//Heavy Tank
+$w['M1A3_Seat0_Shell'] = "M1A3 Abrams";
+$w['T99_Seat0_Shell'] = "T-99 Battle Tank";
+
+//Scout Heli
+$w[''] = "AH-700 Scout";
+
+//Attack Heli
+$w['AH64D_Seat0_Missile'] = "AH-64 Apache Missile";
+$w[''] = "Z-10 Chimera";
+
+//*********************
+// Misc
+//*********************
+
+$w['CQC_M9Knife'] = "Knife";
+$w[''] = "Falling";
+$w[''] = "Bad Luck...";
+
 
 //*********************
 // Map names
 //*********************
+// Stock Homefront Maps
+$m['fl-angelisland'] = "Angel Island";
+$m['fl-borderlands'] = "Borderlands";
+$m['fl-crossroads'] = "Crossroads";
+$m['fl-culdesac'] = "Cul-de-Sac";
+$m['fl-farm'] = "Farm";
+$m['fl-harbor'] = "Green Zone";
+$m['fl-lowlands'] = "Lowlands";
+$m[''] = "Suburb";
 
-$m['None'] = "-Unknown-";
 
 //*********************
 // Event names
 //*********************
-$e[''] = "";
 
 //*********************
 // Bodypart names
 //*********************
-$b['None'] = $text["noneurt"];
-$b['body'] = $text["notidentify"];
 
-?>
+?>

xlrstats/xlrstats/inc_install_award_idents.php

@@ -1249,4 +1249,8 @@ function cod7_awards()
   $buffer .= ")\";\n";
   $coddb->sql_freeresult($result);
 }
-?>
+
+function homefront_awards()
+{}
+
+?>

xlrstats/xlrstats/install/func-installer.php

@@ -280,7 +280,7 @@ function create_statsconfig()
 \$db_pass = \"$db_pass\";
 \$db_db = \"$db_db\";
 
-// What game? (urt, cod1, coduo, cod2, cod4, codwaw, cod6, cod7, wop, smg, bfbc2, moh)
+// What game? (urt, cod1, coduo, cod2, cod4, codwaw, cod6, cod7, wop, smg, bfbc2, moh, homefront)
 \$game = \"$game\";
 \$public_ip = \"$public_ip\";
 // This is the path where B3 stores the status.xml file. May be an absolute path or an URL. (Use forward slashes / only!)

xlrstats/xlrstats/install/index.php

@@ -299,21 +299,22 @@
     echo "<td width=\"30%\"><strong class=\"fontNormal\">Game Name:</strong></td>";
     echo "<td><label>";
     echo "<select name=\"game\" id=\"game\">";
-    echo "<option value=\"urt\">Urban Terror</option>";
+    echo "<option value=\"bfbc2\">Battlefield Bad Company 2</option>";
     echo "<option value=\"cod1\">Call of Duty</option>";
     echo "<option value=\"coduo\">Call of Duty UO</option>";
     echo "<option value=\"cod2\">Call of Duty 2</option>";
     echo "<option value=\"cod4\">Call of Duty 4: MW</option>";
     echo "<option value=\"codwaw\">Call of Duty: WaW</option>";
     echo "<option value=\"cod6\">Call of Duty: MW2</option>";
     echo "<option value=\"cod7\">Call of Duty: Black Ops</option>";
-    echo "<option value=\"wop\">World of Padman</option>";
-    echo "<option value=\"smg\">Smokin' Guns</option>";
-    echo "<option value=\"bfbc2\">Battlefield Bad Company 2</option>";
+    echo "<option value=\"homefront\">Homefront</option>";
     echo "<option value=\"moh\">Medal of Honor</option>";
+    echo "<option value=\"smg\">Smokin' Guns</option>";
+    echo "<option value=\"urt\">Urban Terror</option>";
+    echo "<option value=\"wop\">World of Padman</option>";
     echo "</select>";
     echo "</label></td>";
-    echo "<td class=\"fontSmall\">What game? (urt, cod1, coduo, cod2, cod4, codwaw, cod6, cod7, wop, smg, bfbc2, moh)</td>";
+    echo "<td class=\"fontSmall\">What game? (urt, cod1, coduo, cod2, cod4, codwaw, cod6, cod7, wop, smg, bfbc2, moh, homefront)</td>";
     echo "</tr>";
     echo "<tr>";
     echo "<td><strong class=\"fontNormal\">Public IP:</strong></td>";