Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-29 10:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* remove unnecessary parentheses in include/require

Browse Source
This commit is contained in:
slawkens 2018-05-29 21:00:56 +02:00
parent e1ddf58119
commit 42d23e9b37
42 changed files with 554 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/index.php
View File

@ -1,7 +1,7 @@
<?php
// few things we'll need
require('../common.php');
require_once(BASE . 'config.local.php');
require '../common.php';
require_once BASE . 'config.local.php';
if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['installed']))
{
@ -21,17 +21,17 @@ if(empty($page) || preg_match("/[^a-zA-Z0-9_\-]/", $page))
$page = strtolower($page);
define('PAGE', $page);
require(SYSTEM . 'functions.php');
require(SYSTEM . 'init.php');
require SYSTEM . 'functions.php';
require SYSTEM . 'init.php';
// event system
require_once(SYSTEM . 'hooks.php');
require_once SYSTEM . 'hooks.php';
$hooks = new Hooks();
$hooks->load();
require(SYSTEM . 'status.php');
require(SYSTEM . 'login.php');
require(ADMIN . 'includes/functions.php');
require SYSTEM . 'status.php';
require SYSTEM . 'login.php';
require ADMIN . 'includes/functions.php';
$twig->addGlobal('config', $config);
$twig->addGlobal('status', $status);
@ -56,5 +56,5 @@ ob_end_clean();
// template
$template_path = 'template/';
require(ADMIN . $template_path . 'template.php');
require ADMIN . $template_path . 'template.php';
?>

8
admin/tools/phpinfo.php
View File

@ -1,8 +1,8 @@
<?php
require('../../common.php');
require(SYSTEM . 'functions.php');
require(SYSTEM . 'init.php');
require(SYSTEM . 'login.php');
require '../../common.php';
require SYSTEM . 'functions.php';
require SYSTEM . 'init.php';
require SYSTEM . 'login.php';
if(!admin())
die('Access denied.');

10
admin/tools/status.php
View File

@ -1,9 +1,9 @@
<?php
require('../../common.php');
require(SYSTEM . 'init.php');
require(SYSTEM . 'functions.php');
require(SYSTEM . 'status.php');
require(SYSTEM . 'login.php');
require '../../common.php';
require SYSTEM . 'init.php';
require SYSTEM . 'functions.php';
require SYSTEM . 'status.php';
require SYSTEM . 'login.php';
if(!admin())
die('Access denied.');

10
index.php
View File

@ -183,7 +183,7 @@ if(fetchDatabaseConfig('database_version', $tmp)) { // we got version
if($tmp < DATABASE_VERSION) { // import if older
$db->revalidateCache();
for($i = $tmp + 1; $i <= DATABASE_VERSION; $i++) {
require(SYSTEM . 'migrations/' . $i . '.php');
require SYSTEM . 'migrations/' . $i . '.php';
updateDatabaseConfig('database_version', $i);
}
}
@ -192,7 +192,7 @@ else { // register first version
registerDatabaseConfig('database_version', 0);
$db->revalidateCache();
for($i = 1; $i <= DATABASE_VERSION; $i++) {
require(SYSTEM . 'migrations/' . $i . '.php');
require SYSTEM . 'migrations/' . $i . '.php';
updateDatabaseConfig('database_version', $i);
}
}
@ -408,12 +408,12 @@ if($config['backward_support']) {
$title_full = (isset($title) ? $title . $config['title_separator'] : '') . $config['lua']['serverName'];
if(file_exists($template_path . '/index.php'))
require($template_path . '/index.php');
require $template_path . '/index.php';
else if(file_exists($template_path . '/template.php')) // deprecated
require($template_path . '/template.php');
require $template_path . '/template.php';
else if($config['backward_support'] && file_exists($template_path . '/layout.php'))
{
require($template_path . '/layout.php');
require $template_path . '/layout.php';
}
else
{

4
install/includes/database.php
View File

@ -1,9 +1,9 @@
<?php
defined('MYAAC') or die('Direct access not allowed!');
require(SYSTEM . 'libs/pot/OTS.php');
require SYSTEM . 'libs/pot/OTS.php';
$ots = POT::getInstance();
require(SYSTEM . 'database.php');
require SYSTEM . 'database.php';
if(!isset($db)) {
$database_error = $locale['step_database_error_mysql_connect'] . '<br/>' .

8
install/includes/locale.php
View File

@ -36,8 +36,8 @@ else
$locale_ = 'en';
}
require(LOCALE . 'en/main.php');
require(LOCALE . 'en/install.php');
require LOCALE . 'en/main.php';
require LOCALE . 'en/install.php';
$file_main = LOCALE . $locale_ . '/main.php';
if(!file_exists($file_main))
@ -47,6 +47,6 @@ $file_install = LOCALE . $locale_ . '/install.php';
if(!file_exists($file_install))
$file_install = LOCALE . 'en/install.php';
require($file_main);
require($file_install);
require $file_main;
require $file_install;
?>

16
install/index.php
View File

@ -1,16 +1,16 @@
<?php
require('../common.php');
require '../common.php';
define('MYAAC_INSTALL', true);
// includes
require(SYSTEM . 'functions.php');
require(BASE . 'install/includes/functions.php');
require(BASE . 'install/includes/locale.php');
require(SYSTEM . 'clients.conf.php');
require SYSTEM . 'functions.php';
require BASE . 'install/includes/functions.php';
require BASE . 'install/includes/locale.php';
require SYSTEM . 'clients.conf.php';
if(file_exists(BASE . 'config.local.php'))
require(BASE . 'config.local.php');
require BASE . 'config.local.php';
// twig
require_once LIBS . 'Twig/Autoloader.php';
@ -181,7 +181,7 @@ if(is_writable(CACHE) && (MYAAC_OS != 'WINDOWS' || win_is_writable(CACHE))) {
ob_start();
$step_id = array_search($step, $steps);
require('steps/' . $step_id . '-' . $step . '.php');
require 'steps/' . $step_id . '-' . $step . '.php';
$content = ob_get_contents();
ob_end_clean();
}
@ -192,5 +192,5 @@ else {
}
// render
require('template/template.php');
require 'template/template.php';
//$_SESSION['laststep'] = $step;

2
install/steps/1-welcome.php
View File

@ -14,7 +14,7 @@ else {
if(@file_exists($lang_file_main)
&& @file_exists($lang_file_install))
{
require($lang_file_main);
require $lang_file_main;
$locales[] = array('id' => $tmp_locale, 'name' => $locale['name']);
}
}

4
install/steps/5-database.php
View File

@ -41,11 +41,11 @@ if(!$error) {
}
}
require(BASE . 'install/includes/config.php');
require BASE . 'install/includes/config.php';
if(!$error) {
success($locale['step_database_importing']);
require(BASE . 'install/includes/database.php');
require BASE . 'install/includes/database.php';
if(isset($database_error)) { // we failed connect to the database
error($database_error);

4
install/steps/6-admin.php
View File

@ -1,9 +1,9 @@
<?php
defined('MYAAC') or die('Direct access not allowed!');
require(BASE . 'install/includes/config.php');
require BASE . 'install/includes/config.php';
if(!$error) {
require(BASE . 'install/includes/database.php');
require BASE . 'install/includes/database.php';
if(isset($database_error)) { // we failed connect to the database
error($database_error);

2
install/steps/7-finish.php
View File

@ -6,7 +6,7 @@ if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['save
warning($locale['already_installed']);
}
else {
require(SYSTEM . 'init.php');
require SYSTEM . 'init.php';
if(!$error) {
if(USE_ACCOUNT_NAME)
$account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : null;

12
install/tools/5-database.php
View File

@ -1,19 +1,19 @@
<?php
require_once('../../common.php');
require_once '../../common.php';
require(SYSTEM . 'functions.php');
require(BASE . 'install/includes/functions.php');
require(BASE . 'install/includes/locale.php');
require SYSTEM . 'functions.php';
require BASE . 'install/includes/functions.php';
require BASE . 'install/includes/locale.php';
$error = false;
require(BASE . 'install/includes/config.php');
require BASE . 'install/includes/config.php';
ini_set('max_execution_time', 300);
ob_implicit_flush();
ob_end_flush();
if(!$error) {
require(BASE . 'install/includes/database.php');
require BASE . 'install/includes/database.php';
if(isset($database_error)) { // we failed connect to the database
error($database_error);
return;

22
install/tools/7-finish.php
View File

@ -1,9 +1,9 @@
<?php
require_once('../../common.php');
require_once '../../common.php';
require(SYSTEM . 'functions.php');
require(BASE . 'install/includes/functions.php');
require(BASE . 'install/includes/locale.php');
require SYSTEM . 'functions.php';
require BASE . 'install/includes/functions.php';
require BASE . 'install/includes/locale.php';
ini_set('max_execution_time', 300);
ob_implicit_flush();
@ -14,7 +14,7 @@ if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['save
return;
}
require(SYSTEM . 'init.php');
require SYSTEM . 'init.php';
$deleted = 'deleted';
if($db->hasColumn('players', 'deletion'))
@ -42,19 +42,19 @@ if($success) {
success($locale['step_database_imported_players']);
}
require(LIBS . 'items.php');
require LIBS . 'items.php';
if(Items::loadFromXML())
success($locale['step_database_loaded_items']);
else
error(Items::getError());
require(LIBS . 'weapons.php');
require LIBS . 'weapons.php';
if(Weapons::loadFromXML())
success($locale['step_database_loaded_weapons']);
else
error(Weapons::getError());
require(LIBS . 'creatures.php');
require LIBS . 'creatures.php';
if(Creatures::loadFromXML()) {
success($locale['step_database_loaded_monsters']);
@ -67,7 +67,7 @@ else {
error(Creatures::getLastError());
}
require(LIBS . 'spells.php');
require LIBS . 'spells.php';
if(Spells::loadFromXML()) {
success($locale['step_database_loaded_spells']);
}
@ -76,7 +76,7 @@ else {
}
// update config.highscores_ids_hidden
require_once(SYSTEM . 'migrations/20.php');
require_once SYSTEM . 'migrations/20.php';
$database_migration_20 = true;
$content = '';
if(!databaseMigration20($content)) {
@ -86,7 +86,7 @@ if(!databaseMigration20($content)) {
}
// add z_polls tables
require_once(SYSTEM . 'migrations/22.php');
require_once SYSTEM . 'migrations/22.php';
$locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(str_replace('tools/', '',ADMIN_URL), $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']);
$locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(str_replace('tools/', '', BASE_URL), $locale['step_finish_homepage'], true), $locale['step_finish_desc']);

10
system/bin/install_plugin.php
View File

@ -4,11 +4,11 @@ if(php_sapi_name() != "cli") {
die('This script can be run only in command line mode.');
}
require_once('../../common.php');
require_once(SYSTEM . 'functions.php');
require_once(SYSTEM . 'init.php');
require_once(SYSTEM . 'hooks.php');
require_once(LIBS . 'plugins.php');
require_once '../../common.php';
require_once SYSTEM . 'functions.php';
require_once SYSTEM . 'init.php';
require_once SYSTEM . 'hooks.php';
require_once LIBS . 'plugins.php';
if($argc != 2) {
exit('This command expects one parameter: zip file name (plugin)' . PHP_EOL);

2
system/hooks.php
View File

@ -47,7 +47,7 @@ class Hook
global $db, $config, $template_path, $ots, $content, $twig;
if(file_exists(BASE . $this->_file)) {
$ret = require(BASE . $this->_file);
$ret = require BASE . $this->_file;
}
return $ret === null || $ret == 1 || $ret;

4
system/init.php
View File

@ -120,9 +120,9 @@ if(!isset($config['highscores_ids_hidden']) || count($config['highscores_ids_hid
}
// POT
require_once(SYSTEM . 'libs/pot/OTS.php');
require_once SYSTEM . 'libs/pot/OTS.php';
$ots = POT::getInstance();
require_once(SYSTEM . 'database.php');
require_once SYSTEM . 'database.php';
define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
// load vocation names

2
system/item.php
View File

@ -8,7 +8,7 @@
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');
require_once(SYSTEM . 'libs/items_images.php');
require_once SYSTEM . 'libs/items_images.php';
Items_Images::$files = array(
'otb' => SYSTEM . 'data/items.otb',

10
system/libs/cache.php
View File

@ -19,27 +19,27 @@ class Cache
if(!self::$instance) {
switch(strtolower($engine)) {
case 'apc':
require('cache_apc.php');
require 'cache_apc.php';
self::$instance = new Cache_APC($prefix);
break;
case 'apcu':
require('cache_apcu.php');
require 'cache_apcu.php';
self::$instance = new Cache_APCu($prefix);
break;
case 'eaccelerator':
require('cache_eaccelerator.php');
require 'cache_eaccelerator.php';
self::$instance = new Cache_eAccelerator($prefix);
break;
case 'xcache':
require('cache_xcache.php');
require 'cache_xcache.php';
self::$instance = new Cache_XCache($prefix);
break;
case 'file':
require('cache_file.php');
require 'cache_file.php';
self::$instance = new Cache_File($prefix, CACHE);
break;

2
system/libs/plugins.php
View File

@ -236,7 +236,7 @@ class Plugins {
if (isset($plugin['install'])) {
if (file_exists(BASE . $plugin['install'])) {
$db->revalidateCache();
require(BASE . $plugin['install']);
require BASE . $plugin['install'];
$db->revalidateCache();
}
else

2
system/pages/account.php
View File

@ -11,6 +11,6 @@
defined('MYAAC') or die('Direct access not allowed!');
if($action == 'confirm_email') {
require_once(PAGES . 'account/confirm_email.php');
require_once PAGES . 'account/confirm_email.php';
}
?>

6
system/pages/accountmanagement.php
View File

@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
$title = 'Account Management';
if($config['account_country'])
require(SYSTEM . 'countries.conf.php');
require SYSTEM . 'countries.conf.php';
$groups = new OTS_Groups_List();
@ -30,7 +30,7 @@ if(ACTION == "logout" && !isset($_REQUEST['account_login'])) {
if(!$logged)
{
if(ACTION == 'confirm_email') {
require(PAGES . 'account/' . ACTION . '.php');
require PAGES . 'account/' . ACTION . '.php';
return;
}
@ -137,7 +137,7 @@ $errors = array();
error('Error: Action contains illegal characters.');
}
else if(file_exists(PAGES . 'account/' . $action . '.php')) {
require(PAGES . 'account/' . $action . '.php');
require PAGES . 'account/' . $action . '.php';
}
else {
error('This page does not exists.');

4
system/pages/admin/items.php
View File

@ -10,8 +10,8 @@
defined('MYAAC') or die('Direct access not allowed!');
$title = 'Load items.xml';
require(LIBS . 'items.php');
require(LIBS . 'weapons.php');
require LIBS . 'items.php';
require LIBS . 'weapons.php';
echo $twig->render('admin.items.html.twig');

2
system/pages/admin/menus.php
View File

@ -49,7 +49,7 @@ if(isset($_REQUEST['template'])) {
$file = TEMPLATES . $template . '/config.php';
if(file_exists($file)) {
require_once($file);
require_once $file;
}
else {
echo 'Cannot find template config.php file.';

2
system/pages/admin/plugins.php
View File

@ -10,7 +10,7 @@
defined('MYAAC') or die('Direct access not allowed!');
$title = 'Plugin manager';
require(LIBS . 'plugins.php');
require LIBS . 'plugins.php';
echo $twig->render('admin.plugins.form.html.twig');

2
system/pages/admin/tools.php
View File

@ -25,5 +25,5 @@ if(preg_match("/[^A-z0-9_\-]/", $tool))
$file = BASE . 'admin/pages/tools/' . $tool . '.php';
if(!@file_exists($file))
require($file);
require $file;
?>

2
system/pages/admin/visitors.php
View File

@ -18,7 +18,7 @@ You can enable it by editing this configurable in <b>config.local.php</b> file:<
return;
endif;
require(SYSTEM . 'libs/visitors.php');
require SYSTEM . 'libs/visitors.php';
$visitors = new Visitors($config['visitors_counter_ttl']);
function compare($a, $b) {

2
system/pages/characters.php
View File

@ -11,7 +11,7 @@
defined('MYAAC') or die('Direct access not allowed!');
$title = 'Characters';
require_once(SYSTEM . 'item.php');
require_once SYSTEM . 'item.php';
$groups = new OTS_Groups_List();
function generate_search_form($autofocus = false)

2
system/pages/createaccount.php
View File

@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
$title = 'Create Account';
if($config['account_country'])
require(SYSTEM . 'countries.conf.php');
require SYSTEM . 'countries.conf.php';
if($logged)
{

2
system/pages/forum.php
View File

@ -26,7 +26,7 @@ if(strtolower($config['forum']) != 'site')
if(!$logged)
echo 'You are not logged in. <a href="?subtopic=accountmanagement&redirect=' . BASE_URL . urlencode('?subtopic=forum') . '">Log in</a> to post on the forum.<br /><br />';
require_once(LIBS . 'forum.php');
require_once LIBS . 'forum.php';
$canEdit = Forum::isModerator();
if($canEdit)

4
system/pages/guilds.php
View File

@ -20,14 +20,14 @@ define('MOTD_EXISTS', $db->hasColumn('guilds', 'motd'));
//show list of guilds
if(empty($action)) {
require(PAGES . 'guilds/list_of_guilds.php');
require PAGES . 'guilds/list_of_guilds.php';
}
else {
if(!ctype_alnum(str_replace(array('-', '_'), '', $action))) {
error('Error: Action contains illegal characters.');
}
else if(file_exists(PAGES . 'guilds/' . $action . '.php')) {
require(PAGES . 'guilds/' . $action . '.php');
require PAGES . 'guilds/' . $action . '.php';
}
else {
error('This page does not exists.');

2
system/pages/highscores.php
View File

@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
$title = 'Highscores';
if($config['account_country'] && $config['highscores_country_box'])
require(SYSTEM . 'countries.conf.php');
require SYSTEM . 'countries.conf.php';
$list = isset($_GET['list']) ? $_GET['list'] : '';
$_page = isset($_GET['page']) ? $_GET['page'] : 0;

2
system/pages/news.php
View File

@ -10,7 +10,7 @@
*/
defined('MYAAC') or die('Direct access not allowed!');
require_once(LIBS . 'forum.php');
require_once LIBS . 'forum.php';
if(isset($_GET['archive']))
{

2
system/pages/newsarchive.php
View File

@ -9,5 +9,5 @@
* @link http://my-aac.org
*/
$_GET['archive'] = true;
require('news.php');
require 'news.php';
?>

2
system/pages/online.php
View File

@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
$title = 'Who is online?';
if($config['account_country'])
require(SYSTEM . 'countries.conf.php');
require SYSTEM . 'countries.conf.php';
$promotion = '';
if($db->hasColumn('players', 'promotion'))

2
system/pages/team.php
View File

@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
$title = 'Gamemasters List';
if($config['account_country'])
require(SYSTEM . 'countries.conf.php');
require SYSTEM . 'countries.conf.php';
$groups = new OTS_Groups_List();
if(!$groups->count())

2
templates/tibiacom/headline.php
View File

@ -1,5 +1,5 @@
<?php
//require('../../common.php');
//require '../../common.php';
//$text = $_GET['text'];
/*

4
tools/item.php
View File

@ -1,6 +1,6 @@
<?php
require('../common.php');
require(SYSTEM . 'item.php');
require '../common.php';
require SYSTEM . 'item.php';
if(isset($_GET['id']))
outputItem($_GET['id'], $_GET['count']);

8
tools/news_preview.php
View File

@ -10,10 +10,10 @@
*/
// we need some functions
require('../common.php');
require_once(SYSTEM . 'functions.php');
require_once(SYSTEM . 'init.php');
require_once(SYSTEM . 'template.php');
require '../common.php';
require_once SYSTEM . 'functions.php';
require_once SYSTEM . 'init.php';
require_once SYSTEM . 'template.php';
$error = '';
if(isset($_GET['title'], $_GET['body'], $_GET['player_id'], $_GET['category'], $_GET['forum_section'], $_GET['template_path'], $_GET['type']))

8
tools/signature/index.php
View File

@ -8,9 +8,9 @@
exit;
}
require_once('../../common.php');
require_once(SYSTEM . 'functions.php');
require_once(SYSTEM . 'init.php');
require_once '../../common.php';
require_once SYSTEM . 'functions.php';
require_once SYSTEM . 'init.php';
// Definitions
define('SIGNATURES', TOOLS . 'signature/');
@ -59,7 +59,7 @@
exit;
}
require($file);
require $file;
header('Content-type: image/png');
$seconds_to_cache = $config['signature_browser_cache'] * 60;
$ts = gmdate("D, d M Y H:i:s", time() + $seconds_to_cache) . " GMT";

2
tools/signature/mango.php
View File

@ -6,7 +6,7 @@
**/
/** Load the MadGD class **/
require('gd.class.php');
require 'gd.class.php';
/** Default values **/
list( $i, $eachRow, $percent ) = array( .5, 14, array( 'size' => 7 ) );
/** Get experience points for a certain level **/

10
tools/status.php
View File

@ -1,9 +1,9 @@
<?php
require('../common.php');
require(SYSTEM . 'init.php');
require(SYSTEM . 'functions.php');
require(SYSTEM . 'status.php');
require(SYSTEM . 'login.php');
require '../common.php';
require SYSTEM . 'init.php';
require SYSTEM . 'functions.php';
require SYSTEM . 'status.php';
require SYSTEM . 'login.php';
if(!admin())
die('Access denied.');

6
tools/validate.php
View File

@ -10,9 +10,9 @@
*/
// we need some functions
require('../common.php');
require(SYSTEM . 'functions.php');
require(SYSTEM . 'init.php');
require '../common.php';
require SYSTEM . 'functions.php';
require SYSTEM . 'init.php';
$error = '';
if(isset($_GET['account']))