Use composer for dependency management

.gitignore

@@ -23,4 +23,5 @@ variants/*/cache/
 variants/KnownWorld_901/
 ghostRatingData.*
 gr.php
-adminInfo.php
+adminInfo.php
+vendor/

README.txt

@@ -55,6 +55,14 @@ Edit config.sample.php to work with your setup, being very careful to read the w
 about security issues. The salts/secrets, errorlog/orderlog directories, can all
 leave your server wide open if you don't set them right. Rename to config.php when ready.
 
+=> Composer
+
+Install Composer via https://getcomposer.org/. Then run:
+
+ composer install
+
+This will install all external dependencies that webDiplomacy uses.
+
 => Log-on
 Once you've set config.php up you can use the random gameMasterSecret you entered
 to authenticate as the admin. First create a user via the registration page, then 

composer.json

@@ -0,0 +1,18 @@
+{
+ "name": "kestasjk/web-diplomacy",
+ "description": "webDiplomacy",
+ "keywords": ["diplomacy"],
+ "type": "project",
+ "repositories": [],
+ "require": {
+ "php": "^7.0"
+ },
+ "require-dev": {},
+ "config": {
+ "preferred-install": "dist",
+ "sort-packages": true,
+ "optimize-autoloader": true
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true
+}

contrib/PHPMailer_v5.1/PHPMailerAutoload.php

@@ -30,20 +30,5 @@ function PHPMailerAutoload($classname)
  }
 }
 
-if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
- //SPL autoloading was introduced in PHP 5.1.2
- if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
- spl_autoload_register('PHPMailerAutoload', true, true);
- } else {
- spl_autoload_register('PHPMailerAutoload');
- }
-} else {
- /**
- * Fall back to traditional autoload for old PHP versions
- * @param string $classname The name of the class to load
- */
- function __autoload($classname)
- {
- PHPMailerAutoload($classname);
- }
-}
+//SPL autoloading was introduced in PHP 5.1.2
+spl_autoload_register('PHPMailerAutoload', true, true);

header.php

@@ -47,6 +47,7 @@ function setExpires($expires) {
 if( !defined('IN_CODE') )
  define('IN_CODE', 1); // A flag to tell scripts they aren't being executed by themselves
 
+require_once 'vendor/autoload.php';
 require_once('config.php');
 
 require_once('global/definitions.php');

variants/variant.php

@@ -388,16 +388,15 @@ public function link() {
  * [Name]Variant -> variants/[Name]/variant.php
  * [Name]Variant_[Class] -> variants/[Name]/classes/[Class].php
  */
-function __autoload($classname) {
+spl_autoload_register(function ($classname) {
+ $pos = strpos($classname, 'Variant');
+ if (empty($pos)) return;
 
- if( !( $pos=strpos($classname,'Variant') ) || $pos==0 ) return;
+ $variantName = substr($classname, 0, $pos);
 
- $variantName=substr($classname, 0, $pos);
+ $variantFile = $classname == $variantName . 'Variant' ?
+ l_r('variants/' . $variantName . '/variant.php') :
+ l_r('variants/' . $variantName . '/classes/' . substr($classname, ($pos + 8)) . '.php');
 
- if( $classname==$variantName.'Variant' )
- require_once(l_r('variants/'.$variantName.'/variant.php'));
- else
- require_once(l_r('variants/'.$variantName.'/classes/'.substr($classname, ($pos+8)).'.php'));
-}
-
-?>
+ require_once $variantFile;
+});