FluxCP 2.0

.editorconfig

@@ -0,0 +1,22 @@
+# rAthena FluxCP EditorConfig file
+# EditorConfig is awesome: https://EditorConfig.org
+
+root = true
+
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.php]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2

.env.example

@@ -0,0 +1,7 @@
+# rAthena environment configuration file
+APP_ENV="production"
+APP_ADDRESS="localhost"
+APP_BASE_URI="/"
+
+INSTALLER_PASSWORD="CHANGEME"
+DEFAULT_LANGUAGE="en-us"

.gitignore

@@ -18,3 +18,19 @@
 # Caches
 /data/tmp/*.php
 /data/tmp/*.cache
+/data/tmp/emblems
+
+# Non-Default Themes
+/themes/*
+!/themes/default
+!/themes/bootstrap
+!/themes/installer
+
+# Composer's vendor directory
+/vendor/
+
+# Intellij IDEA/phpStorm
+/.idea/
+
+# .env
+.env

README.md

@@ -1,64 +1,60 @@
-FluxCP
-======
+# FluxCP
+
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/rathena/FluxCP.svg?logo=lgtm&logoWidth=18&color=orange)](https://lgtm.com/projects/g/rathena/FluxCP/alerts/)
 [![Open Issues](https://img.shields.io/github/issues/rathena/FluxCP.svg?logo=github&logoWidth=18&color=yellow)](https://lgtm.com/projects/g/rathena/FluxCP/alerts/)
 [![Open PRs](https://img.shields.io/github/issues-pr/rathena/FluxCP.svg?logo=github&logoWidth=18&color=blue)](https://lgtm.com/projects/g/rathena/FluxCP/alerts/)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d842cd47636244668f3093151b288eff)](https://www.codacy.com/app/rathena/FluxCP?utm_source=github.com&utm_medium=referral&utm_content=rathena/FluxCP&utm_campaign=Badge_Grade)
 
 Flux Control Panel (FluxCP) for rAthena servers.
 
-Requirements
----------
-* PHP 5.2
-* PDO and PDO-MYSQL extensions for PHP5 (including PHP_MYSQL support)
+## Requirements
+* Composer dependency manager
+* PHP 7.0 or later
+* PDO and PDO-MYSQL extensions for PHP
 * MySQL 5
 * Optional: GD2 (for guild emblems and registration CAPTCHA)
 * Optional: Tidy (for cleaner HTML output)
 * Optional: mod_rewrite support for UseCleanUrls feature
 * Optional: [Item images](http://rathena.org/board/files/file/2509-item-images/)
 
 
-What's New?
----------
+## What's New?
 * The description files are kept upto-date with each new commit from rAthena.
 * Pre-integrated themes:
-	- default
-	- Bootstrap
+	* default
+	* Bootstrap
 
 * Built-In:
-	- News and Pages CMS with integrated TinyMCE
-	- Service Desk (ITIL Incident Management style support ticket system)
-	- Additional Logs
-	- More Ranking Lists
-    - Discord Integration
-    - Google ReCaptcha
-    - Remote AtCommand functionality
+	* News and Pages CMS with integrated TinyMCE
+	* Service Desk (ITIL Incident Management style support ticket system)
+	* Additional Logs
+	* More Ranking Lists
+    * Discord Integration
+    * Google ReCaptcha
+    * Remote AtCommand functionality
 
 
-How To ... ?
----------
+## How To ... ?
 We have a small doc library that covers:
 * Basic User Documentation
-    - Installation
-    - [Themes](https://github.com/rathena/FluxCP/blob/master/doc/user_theme.md)
-    - [Languages](https://github.com/rathena/FluxCP/blob/master/doc/user_lang.md)
-    - Installing Addons
-    - Updating FluxCP
+    * [Installation](https://github.com/rathena/FluxCP/blob/master/doc/installing.md)
+    * [Themes](https://github.com/rathena/FluxCP/blob/master/doc/user_theme.md)
+    * [Languages](https://github.com/rathena/FluxCP/blob/master/doc/user_lang.md)
+    * Installing Addons
+    * Updating FluxCP
 
 * Developer Documentation
-    - Creating an Addon
-    - Providing Addon updates
-    - Creating a custom Theme
-
+    * Creating an Addon
+    * Providing Addon updates
+    * Creating a custom Theme
+    * [Migrating your addon to FluxCP 2.0](https://github.com/rathena/FluxCP/blob/master/doc/migrating.md)
 
-Join the Discussion
----------
+## Join the Discussion
 We have a discord server separate from rAthena just for FluxCP stuff!
 The channels there can be used to obtain help, discuss testing, view anonymous feedback log, Github commits, etc.
 https://discord.gg/0XP9qqhUV9GLSfCh
 
 
-Extra Credits
----------
+## Extra Credits
 Original FluxCP created by Paradox924X and Byteflux with additional contributions from Xantara.
 Some works from other users have been integrated into this project.

addons/helloworld/modules/helloworld/index.php

@@ -1,4 +1,7 @@
 <?php
+
+use rAthena\FluxCp\Flux;
+
 if (!defined('FLUX_ROOT')) exit;
 
 $fluxVersion  = Flux::VERSION;

addons/helloworld/themes/default/helloworld/index.php

@@ -1,4 +1,6 @@
-<?php if (!defined('FLUX_ROOT')) exit; ?>
+<?php use rAthena\FluxCp\Flux;
+
+if (!defined('FLUX_ROOT')) exit; ?>
 <h2><?php echo Flux::message('HelloWorld') ?></h2>
 <p><?php echo Flux::message('HelloInfoText') ?></p>
 <p><?php printf(Flux::message('HelloVersionText'), $fluxVersion) ?></p>

composer.json

@@ -0,0 +1,26 @@
+{
+  "name": "rathena/fluxcp",
+  "description": "rAthena MMORPG server control panel",
+  "type": "project",
+  "license": "LGPL-3.0-only",
+  "minimum-stability": "stable",
+  "require": {
+    "php": ">=7.0",
+    "ext-pdo": "*",
+    "ext-pdo_mysql": "*",
+    "ext-gd": "*",
+    "phpmailer/phpmailer": "^5.2.27",
+    "vlucas/phpdotenv": "^3.3"
+  },
+  "autoload": {
+    "psr-4": {
+      "rAthena\\FluxCp\\": "src/"
+    },
+    "files": [
+      "src/functions_include.php"
+    ]
+  },
+  "require-dev": {
+    "filp/whoops": "^2.3"
+  }
+}