yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc/Mergefix

Browse Source 
* added clean db dump
 * cleanup fails from profiler merge
 * maybe fixed setup being unable to find images for processing
 * version push
This commit is contained in:
Sarjuuk
2018-03-26 15:10:08 +02:00
parent 0ff0e5b59e
commit 160c15a5f2
8 changed files with 1069 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/shared.php
View File

@@ -1,6 +1,6 @@
<?php <?php
define('AOWOW_REVISION', 26); define('AOWOW_REVISION', 27);
define('CLI', PHP_SAPI === 'cli'); define('CLI', PHP_SAPI === 'cli');

2
includes/utilities.php
View File

@@ -1329,7 +1329,7 @@ class Util
if ($itemLevel == 60 && $quality == ITEM_QUALITY_UNCOMMON) if ($itemLevel == 60 && $quality == ITEM_QUALITY_UNCOMMON)
return 6.0; return 6.0;
// common - BC - vendored gems // common - BC - vendored gems
if ($itemLevel == 55 && $quality == ITEM_QUALITY_COMMON) if ($itemLevel == 55 && $quality == ITEM_QUALITY_NORMAL)
return 4.0; return 4.0;
// dafuq..? // dafuq..?

1938
setup/db_structure.sql
View File

File diff suppressed because one or more lines are too long

13
setup/tools/fileGen.class.php
View File

@@ -233,21 +233,12 @@ class FileGen
CLI::write('Also, expected include setup/tools/filegen/'.$name.'.func.php was not found.'); CLI::write('Also, expected include setup/tools/filegen/'.$name.'.func.php was not found.');
} }
} }
}
if (fWrite($dest, $content))
{
CLI::write(sprintf(ERR_NONE, CLI::bold($destPath.$file)), CLI::LOG_OK);
if ($content && $funcOK) if ($content && $funcOK)
if (CLISetup::writeFile($destPath.$file, $content))
$success = true; $success = true;
} }
else
CLI::write(sprintf(ERR_WRITE_FILE, CLI::bold($destPath.$file)), CLI::LOG_ERROR);
fClose($dest);
}
else
CLI::write(sprintf(ERR_CREATE_FILE, CLI::bold($destPath.$file)), CLI::LOG_ERROR);
}
else else
CLI::write(sprintf(ERR_READ_FILE, CLI::bold(FileGen::$tplPath.$file.'.in')), CLI::LOG_ERROR); CLI::write(sprintf(ERR_READ_FILE, CLI::bold(FileGen::$tplPath.$file.'.in')), CLI::LOG_ERROR);
} }

4
setup/tools/filegen/complexImg.func.php
View File

@@ -219,7 +219,7 @@ if (!CLI)
if (!($mode & $modeMask)) if (!($mode & $modeMask))
unset($paths[$mode]); unset($paths[$mode]);
foreach (CLISetup::$expectedPaths as $xp => $__) foreach (CLISetup::$expectedPaths as $xp => $locId)
{ {
if (!in_array($locId, CLISetup::$localeIds)) if (!in_array($locId, CLISetup::$localeIds))
continue; continue;
@@ -426,7 +426,7 @@ if (!CLI)
if(!isset($paths[0x16][2][$mapLoc])) if(!isset($paths[0x16][2][$mapLoc]))
continue; continue;
$p = sprintf($imgPath, $mapLoc).$paths[0]; $p = sprintf($imgPath, $mapLoc.'/').$paths[0x16][0];
if (CLISetup::fileExists($p)) if (CLISetup::fileExists($p))
{ {
CLI::write(' - using files from '.($mapLoc ?: '/').' for locale '.Util::$localeStrings[$l], CLI::LOG_INFO); CLI::write(' - using files from '.($mapLoc ?: '/').' for locale '.Util::$localeStrings[$l], CLI::LOG_INFO);

4
setup/tools/sqlgen/events.func.php
View File

@@ -24,8 +24,8 @@ function events(array $ids = [])
ge.eventEntry, ge.eventEntry,
holiday, holiday,
0, -- cuFlags 0, -- cuFlags
UNIX_TIMESTAMP(start_time), IFNULL(UNIX_TIMESTAMP(start_time), 0),
UNIX_TIMESTAMP(end_time), IFNULL(UNIX_TIMESTAMP(end_time), 0),
occurence * 60, occurence * 60,
length * 60, length * 60,
IF (gep.eventEntry IS NOT NULL, GROUP_CONCAT(prerequisite_event SEPARATOR " "), NULL), IF (gep.eventEntry IS NOT NULL, GROUP_CONCAT(prerequisite_event SEPARATOR " "), NULL),

29
setup/updates/1521735363_01.sql
View File

@@ -15,21 +15,22 @@ CREATE TABLE `aowow_profiler_sync` (
DROP TABLE IF EXISTS `aowow_profiler_guild`; DROP TABLE IF EXISTS `aowow_profiler_guild`;
CREATE TABLE `aowow_profiler_guild` ( CREATE TABLE `aowow_profiler_guild` (
`id` int(10) unsigned NOT NULL, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`realm` int(10) unsigned NOT NULL DEFAULT '0', `realm` int(10) unsigned NOT NULL,
`realmGUID` int(10) unsigned NOT NULL DEFAULT '0', `realmGUID` int(10) unsigned NOT NULL,
`cuFlags` int(10) unsigned NOT NULL DEFAULT '0', `cuFlags` int(10) unsigned NOT NULL DEFAULT 0,
`name` varchar(26) NOT NULL DEFAULT '', `name` varchar(26) NOT NULL,
`nameUrl` varchar(26) NOT NULL DEFAULT '', `nameUrl` varchar(26) NOT NULL,
`emblemStyle` tinyint(3) unsigned NOT NULL DEFAULT '0', `emblemStyle` tinyint(3) unsigned NOT NULL DEFAULT 0,
`emblemColor` tinyint(3) unsigned NOT NULL DEFAULT '0', `emblemColor` tinyint(3) unsigned NOT NULL DEFAULT 0,
`borderStyle` tinyint(3) unsigned NOT NULL DEFAULT '0', `borderStyle` tinyint(3) unsigned NOT NULL DEFAULT 0,
`borderColor` tinyint(3) unsigned NOT NULL DEFAULT '0', `borderColor` tinyint(3) unsigned NOT NULL DEFAULT 0,
`backgroundColor` tinyint(3) unsigned NOT NULL DEFAULT '0', `backgroundColor` tinyint(3) unsigned NOT NULL DEFAULT 0,
`info` varchar(500) NOT NULL DEFAULT '', `info` varchar(500) NOT NULL DEFAULT '',
`createDate` int(10) unsigned NOT NULL DEFAULT '0', `createDate` int(10) unsigned NOT NULL DEFAULT 0,
INDEX `name` (`name`), PRIMARY KEY (`id`),
INDEX `guild` (`id`) UNIQUE KEY `realm_realmGUID` (`realm`,`realmGUID`),
KEY `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
DROP TABLE IF EXISTS `aowow_profiler_guild_rank`; DROP TABLE IF EXISTS `aowow_profiler_guild_rank`;

2
static/js/Profiler.js
View File

@@ -4652,7 +4652,7 @@ function ProfilerInventory(_parent) {
style: 'outline: none' style: 'outline: none'
}; };
// swfobject.embedSWF(g_staticUrl + '/modelviewer/ZAMviewerfp11.swf', _swfModel.id, '100%', '100%', '10.0.0', g_staticUrl + '/modelviewer/expressInstall.swf', flashVars, params, attributes); swfobject.embedSWF(g_staticUrl + '/modelviewer/ZAMviewerfp11.swf', _swfModel.id, '100%', '100%', '10.0.0', g_staticUrl + '/modelviewer/expressInstall.swf', flashVars, params, attributes);
// swfobject.embedSWF('http://static.wowhead.com/modelviewer/ZAMviewerfp11.swf', _swfModel.id, '100%', '100%', '10.0.0', 'http://static.wowhead.com/modelviewer/expressInstall.swf', flashVars, params, attributes); // swfobject.embedSWF('http://static.wowhead.com/modelviewer/ZAMviewerfp11.swf', _swfModel.id, '100%', '100%', '10.0.0', 'http://static.wowhead.com/modelviewer/expressInstall.swf', flashVars, params, attributes);
_mvInited = true; _mvInited = true;