1.7.0

.htaccess

@@ -1,38 +1,50 @@
+# ----------------------------------------------------------------------
+# Better website experience for IE users
+# ----------------------------------------------------------------------
+
+# Force the latest IE version, in various cases when it may fall back to IE7 mode
+#  github.com/rails/rails/commit/123eb25#commitcomment-118920
+# Use ChromeFrame if it's installed for a better experience for the poor IE folk
+<IfModule mod_headers.c>
+  Header set X-UA-Compatible "IE=Edge,chrome=1"
+  # mod_headers can't match by content-type, but we don't want to send this header on *everything*...
+  <FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|ico|webp|appcache|manifest|htc|crx|oex|xpi|safariextz|vcf)$" >
+    Header unset X-UA-Compatible
+  </FilesMatch>
+</IfModule>
+
+
+# ----------------------------------------------------------------------
+# UTF-8 encoding
+# ----------------------------------------------------------------------
+
+# Use UTF-8 encoding for anything served text/plain or text/html
 AddDefaultCharset utf-8
-FileETag MTime Size
-
-<IfModule mod_deflate.c>
-	SetOutputFilter DEFLATE
-	BrowserMatch ^Mozilla/4 gzip-only-text/html
-	BrowserMatch ^Mozilla/4.0[678] no-gzip
-	BrowserMatch bMSI[E] !no-gzip !gzip-only-text/html
-	SetEnvIfNoCase Request_URI .(?:gif|jpe?g|png)$ no-gzip dont-vary
-	<IfModule mod_headers.c>
-		Header append Vary User-Agent env=!dont-vary
-	</IfModule>
+
+# Force UTF-8 for a number of file formats
+AddCharset utf-8 .css .js .xml .json .rss .atom
+
+<IfModule mod_autoindex.c>
+  Options -Indexes
 </IfModule>
 
 <IfModule mod_rewrite.c>
-	RewriteEngine on
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteCond %{REQUEST_FILENAME} !-l
-	RewriteRule .* index.php [L]
+  RewriteCond %{SCRIPT_FILENAME} -d
+  RewriteCond %{SCRIPT_FILENAME} -f
+  RewriteRule "(^|/)\." - [F]
 </IfModule>
 
-<IfModule mod_expires.c>
-	ExpiresActive On
-	ExpiresDefault A3600
-	<FilesMatch \.js$>
-		ExpiresDefault A43200
-	</FilesMatch>
-	<FilesMatch \.css$>
-		ExpiresDefault A172800
-	</FilesMatch>
-	<FilesMatch \.(?:gif|jpe?g|png|ico)$>
-		ExpiresDefault A604800
-	</FilesMatch>
-	<FilesMatch \.php$>
-		ExpiresActive Off
-	</FilesMatch>
+<FilesMatch "(\.(bak|config|sql|fla|psd|ini|log|sh|inc|swp|dist)|~)$">
+  Order allow,deny
+  Deny from all
+  Satisfy All
+</FilesMatch>
+
+# ----------------------------------------------------------------------
+# 2Moons: Multiuniverse support
+# ----------------------------------------------------------------------
+
+<IfModule mod_rewrite.c>
+	RewriteEngine on
+	RewriteRule uni([0-9]+)/?(.*)?$ $2 [L,QSA,E=UNI:$1]
 </IfModule>

CombatReport.php

@@ -2,7 +2,7 @@
 
 /**
  *  2Moons
- *  Copyright (C) 2011  Slaver
+ *  Copyright (C) 2012 Jan Kröpke
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,65 +18,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package 2Moons
- * @author Slaver <[email protected]>
- * @copyright 2009 Lucky <[email protected]> (XGProyecto)
- * @copyright 2011 Slaver <[email protected]> (Fork/2Moons)
+ * @author Jan Kröpke <[email protected]>
+ * @copyright 2012 Jan Kröpke <[email protected]>
  * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
  * @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
  */
 
-define('INSIDE'  , true);
-define('AJAX', true );
+define('MODE', 'INGAME');
 
 define('ROOT_PATH', str_replace('\\', '/',dirname(__FILE__)).'/');
-require(ROOT_PATH . 'includes/common.php');
-require(ROOT_PATH . 'includes/classes/class.template.php');
 
-if(isset($_SESSION['USER']))
-	$LANG->setUser($_SESSION['USER']['lang']);	
-else
-	$LANG->GetLangFromBrowser();
-
-$LANG->includeLang(array('L18N', 'FLEET', 'TECH'));
-
-$RID		= request_var('raport', 0);
-$Fame		= request_var('fame', 0);
-if($Fame == 1) {
-	$Raport		= $db->uniquequery("SELECT 
-									`raport`, `time`,
-									(
-										SELECT 
-										GROUP_CONCAT(username SEPARATOR ' & ') as attacker
-										FROM ".USERS." 
-										WHERE `id` IN (SELECT `uid` FROM ".TOPKB_USERS." WHERE ".TOPKB_USERS.".`rid` = ".RW.".`rid` AND `role` = 1)
-									) as `attacker`,
-									(
-										SELECT 
-										GROUP_CONCAT(username SEPARATOR ' & ') as defender
-										FROM ".USERS." 
-										WHERE `id` IN (SELECT `uid` FROM ".TOPKB_USERS." WHERE ".TOPKB_USERS.".`rid` = ".RW.".`rid` AND `role` = 2)
-									) as `defender`
-									FROM ".RW."
-									WHERE `rid` = ".$RID.";");
-	$Info		= array($Raport["attacker"], $Raport["defender"]);
-} else {
-	$Raport		= $db->uniquequery("SELECT `raport` FROM ".RW." WHERE `rid` = ".$RID.";");
-	$Info		= array();
-}
-
-$template	= new template();
-if(!isset($Raport)) {
-	$template->message($LNG['sys_raport_not_found'], 0, false, true);
-	exit;
-}
-$template->isPopup(true);
-$template->assign_vars(array(
-	'Raport'	=> unserialize($Raport["raport"]),
-	'Info'		=> $Info,
-	'fame'		=> $Fame
-));
-$template->show('CombatRaport.tpl');
-
-?>
+require(ROOT_PATH.'includes/common.php');
+HTTP::redirectTo('game.php?page=raport&raport='.HTTP::_GP('raport', ''));

admin.php

@@ -2,7 +2,7 @@
 
 /**
  *  2Moons
- *  Copyright (C) 2011  Slaver
+ *  Copyright (C) 2012 Jan Kröpke
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,24 +18,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package 2Moons
- * @author Slaver <[email protected]>
- * @copyright 2009 Lucky <[email protected]> (XGProyecto)
- * @copyright 2011 Slaver <[email protected]> (Fork/2Moons)
+ * @author Jan Kröpke <[email protected]>
+ * @copyright 2012 Jan Kröpke <[email protected]>
  * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
  * @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
  */
 
-define('INSIDE'  , true);
-define('IN_ADMIN', true);
+define('MODE', 'ADMIN');
 
 define('ROOT_PATH', str_replace('\\', '/',dirname(__FILE__)).'/');
 
 require(ROOT_PATH . 'includes/common.php');
 require_once(ROOT_PATH . 'includes/classes/class.Log.php');
 
-if ($USER['authlevel'] == AUTH_USR) redirectTo('game.php');
+if ($USER['authlevel'] == AUTH_USR) HTTP::redirectTo('game.php');
 
 if(!isset($_SESSION['admin_login']) || $_SESSION['admin_login'] != $USER['password'])
 {
@@ -44,8 +42,8 @@
 	exit;
 }
 
-$page = request_var('page', '');
-$uni = request_var('uni', 0);
+$page = HTTP::_GP('page', '');
+$uni = HTTP::_GP('uni', 0);
 
 if($USER['authlevel'] == AUTH_ADM && !empty($uni))
 	$_SESSION['adminuni'] = $uni;
@@ -54,6 +52,10 @@
 
 switch($page)
 {
+	case 'logout':
+		include_once(ROOT_PATH . 'includes/pages/adm/ShowLogoutPage.php');
+		ShowLogoutPage();
+	break;
 	case 'infos':
 		include_once(ROOT_PATH . 'includes/pages/adm/ShowInformationPage.php');
 		ShowInformationPage();
@@ -90,9 +92,9 @@
 		include_once(ROOT_PATH . 'includes/pages/adm/ShowStatsPage.php');
 		ShowStatsPage();
 	break;
-	case 'update':
-		include_once(ROOT_PATH . 'includes/pages/adm/ShowUpdatePage.php');
-		ShowUpdatePage();
+	case 'disclamer':
+		include_once(ROOT_PATH . 'includes/pages/adm/ShowDisclamerPage.php');
+		ShowDisclamerPage();
 	break;
 	case 'create':
 		include_once(ROOT_PATH . 'includes/pages/adm/ShowCreatorPage.php');
@@ -128,7 +130,7 @@
 	break;
 	case 'support':
 		include_once(ROOT_PATH . 'includes/pages/adm/ShowSupportPage.php');
-		ShowSupportPage();
+		new ShowSupportPage();
 	break;
 	case 'password':
 		include_once(ROOT_PATH . 'includes/pages/adm/ShowPassEncripterPage.php');
@@ -190,10 +192,24 @@
 		include_once(ROOT_PATH . 'includes/pages/adm/ShowVertify.php');
 		ShowVertify();
 	break;
+	case 'cronjob':
+		include_once(ROOT_PATH . 'includes/pages/adm/ShowCronjobPage.php');
+		ShowCronjob();
+	break;
+	case 'giveaway':
+		include_once(ROOT_PATH . 'includes/pages/adm/ShowGiveawayPage.php');
+		ShowGiveaway();
+	break;
+	case 'autocomplete':
+		include_once(ROOT_PATH . 'includes/pages/adm/ShowAutoCompletePage.php');
+		ShowAutoCompletePage();
+	break;
+	case 'dump':
+		include_once(ROOT_PATH . 'includes/pages/adm/ShowDumpPage.php');
+		ShowDumpPage();
+	break;
 	default:
 		include_once(ROOT_PATH . 'includes/pages/adm/ShowIndexPage.php');
 		ShowIndexPage();
 	break;
 }
-
-?>