Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-12-03 16:16:50 +01: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
Download Patch File Download Diff File Expand all files Collapse all files

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/>' .

10
install/includes/locale.php
View File

@@ -31,13 +31,13 @@ else
}
}
}
if(!isset($locale_))
$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']);
}
}

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

@@ -40,13 +40,13 @@ 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);
}

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

@@ -1,10 +1,10 @@
<?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']);