Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-17 19:23:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid globals where possible

Browse Source 
$logged => logged()
$account_logged => accountLogged()
This commit is contained in:
slawkens
2025-03-16 12:36:22 +01:00
parent a71f41193c
commit 13b8fcf454
85 changed files with 226 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
system/libs/pot/OTS_Account.php
View File

@@ -478,12 +478,12 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
public function isPremium()
{
global $config;
if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return true;
$configFreePremium = configLua('freePremium');
if(isset($configFreePremium) && getBoolean($configFreePremium)) return true;
if(isset($this->data['premium_ends_at'])) {
return $this->data['premium_ends_at'] > time();
}
if(isset($this->data['premium_ends_at'])) {
return $this->data['premium_ends_at'] > time();
}
if(isset($this->data['premend'])) {
return $this->data['premend'] > time();
@@ -772,7 +772,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
$filter->compareField('account_id', (int) $this->data['id']);
if(!$withDeleted) {
global $db;
$db = app()->get('database');
if($db->hasColumn('players', 'deletion')) {
$filter->compareField('deletion', 0);
} else {
@@ -936,7 +936,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
return $this->data['group_id'];
}
global $db;
$db = app()->get('database');
if($db->hasColumn('accounts', 'group_id')) {
$query = $this->db->query('SELECT `group_id` FROM `accounts` WHERE `id` = ' . (int) $this->getId())->fetch();
// if anything was found
@@ -963,7 +963,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
return $this->data['group_id'];
}
global $db;
$db = app()->get('database');
if($db->hasColumn('accounts', 'group_id')) {
$query = $this->db->query('SELECT `group_id` FROM `accounts` WHERE `id` = ' . (int) $this->getId())->fetch();
// if anything was found

10
system/libs/pot/OTS_DB_MySQL.php
View File

@@ -97,14 +97,13 @@ class OTS_DB_MySQL extends OTS_Base_DB
$params['persistent'] = false;
}
global $config;
$cache = app()->get('cache');
if($cache->enabled()) {
$tmp = null;
$need_revalidation = true;
if($cache->fetch('database_checksum', $tmp) && $tmp) {
$tmp = unserialize($tmp);
if(sha1($config['database_host'] . '.' . $config['database_name']) === $tmp) {
if(sha1(config('database_host') . '.' . config('database_name')) === $tmp) {
$need_revalidation = false;
}
}
@@ -148,8 +147,6 @@ class OTS_DB_MySQL extends OTS_Base_DB
public function __destruct()
{
global $config;
$cache = app()->get('cache');
if($cache->enabled()) {
if ($this->clearCacheAfter) {
@@ -160,7 +157,7 @@ class OTS_DB_MySQL extends OTS_Base_DB
else {
$cache->set('database_tables', serialize($this->has_table_cache), 3600);
$cache->set('database_columns', serialize($this->has_column_cache), 3600);
$cache->set('database_checksum', serialize(sha1($config['database_host'] . '.' . $config['database_name'])), 3600);
$cache->set('database_checksum', serialize(sha1(config('database_host') . '.' . config('database_name'))), 3600);
}
}
@@ -218,8 +215,7 @@ class OTS_DB_MySQL extends OTS_Base_DB
}
private function hasTableInternal($name) {
global $config;
return ($this->has_table_cache[$name] = $this->query('SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = ' . $this->quote($config['database_name']) . ' AND `TABLE_NAME` = ' . $this->quote($name) . ' LIMIT 1;')->rowCount() > 0);
return ($this->has_table_cache[$name] = $this->query('SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = ' . $this->quote(config('database_name')) . ' AND `TABLE_NAME` = ' . $this->quote($name) . ' LIMIT 1;')->rowCount() > 0);
}
public function hasColumn($table, $column) {

4
system/libs/pot/OTS_Group.php
View File

@@ -490,7 +490,9 @@ class OTS_Group extends OTS_Row_DAO implements IteratorAggregate, Countable
// creates filter
$filter = new OTS_SQLFilter();
$filter->compareField('group_id', (int) $this->data['id']);
global $db;
$db = app()->get('database');
if($db->hasColumn('players', 'deletion'))
$filter->compareField('deletion', 0);
else

2
system/libs/pot/OTS_Guild.php
View File

@@ -284,8 +284,6 @@ class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
}
public function hasMember(OTS_Player $player) {
global $db;
if(!$player || !$player->isLoaded()) {
return false;
}

3
system/libs/pot/OTS_Player.php
View File

@@ -854,9 +854,8 @@ class OTS_Player extends OTS_Row_DAO
}
if(isset($this->data['promotion'])) {
global $config;
if((int)$this->data['promotion'] > 0)
return ($this->data['vocation'] + ($this->data['promotion'] * $config['vocations_amount']));
return ($this->data['vocation'] + ($this->data['promotion'] * config('vocations_amount')));
}
return $this->data['vocation'];