mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-14 09:44:55 +02:00
feat: replace POT Query Builder to Eloquent ORM (#230)
* wip * wip * wip * wip * wip * fix: reusing pdo connection from pot * wip * wip * wip * wip * move files In future, all classes will be in src/ folder * Replace namespace name, for future * Remove duplicated exception * Fix towns from db * Fix spells page * Add default FAQ question + FAQ model * feat: reset colors in menus * Add confirm + save button at the top (menus) * Do not insert duplicated FAQ on install * Refactor install menus * Fix changelogs showing * Fix menu update, only with specified template name * Fix account create -> missing compat * Fix bans_per_page * banned_by is player_id. type = 2 is namelock in tfs 0.3 * Add getPlayerNameById, fix getPlayerNameByAccount * Change link name * Order by lastlogin * fix: query optimize * wip * wip * wip * wip * wip * wip * wip * Refactor notepad.php, class was useless * This is showing error, if the updated rows = 0 * Fix success & error class (bootstrap) * Uncomment require migrate.php * Some distro have owner_id * Update Player.php --------- Co-authored-by: slawkens <slawkens@gmail.com>
This commit is contained in:
@@ -8,6 +8,9 @@
|
||||
* @copyright 2019 MyAAC
|
||||
* @link https://my-aac.org
|
||||
*/
|
||||
|
||||
use MyAAC\Models\Spell;
|
||||
|
||||
defined('MYAAC') or die('Direct access not allowed!');
|
||||
$title = 'Spells';
|
||||
|
||||
@@ -34,10 +37,10 @@ else {
|
||||
|
||||
$order = 'name';
|
||||
$spells = array();
|
||||
$spells_db = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'spells` WHERE `hidden` != 1 AND `type` < 4 ORDER BY ' . $order . '');
|
||||
$spells_db = Spell::where('hidden', '!=', 1)->where('type', '<', 4)->orderBy($order)->get();
|
||||
|
||||
if((string)$vocation_id != 'all') {
|
||||
foreach($spells_db->fetchAll() as $spell) {
|
||||
foreach($spells_db as $spell) {
|
||||
$spell_vocations = json_decode($spell['vocations'], true);
|
||||
if(in_array($vocation_id, $spell_vocations) || count($spell_vocations) == 0) {
|
||||
$spell['vocations'] = null;
|
||||
@@ -46,7 +49,7 @@ if((string)$vocation_id != 'all') {
|
||||
}
|
||||
}
|
||||
else {
|
||||
foreach($spells_db->fetchAll() as $spell) {
|
||||
foreach($spells_db as $spell) {
|
||||
$vocations = json_decode($spell['vocations'], true);
|
||||
|
||||
foreach($vocations as &$tmp_vocation) {
|
||||
|
Reference in New Issue
Block a user