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

* update item_images_url config to 1092

Browse Source 
*  for backward support new require constants will be used for semantic
versioning: myaac_, php_, database_
* updated TODO
This commit is contained in:
slawkens1 2017-12-26 20:55:43 +01:00
parent 62443257fc
commit a95c93cd5b
3 changed files with 79 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -2,13 +2,14 @@
0.*
* support duplicated vocation names with different ids
* plugins: option to define custom requirements check in json file, to check if system meets the requirement
* cache Menus in templates
* sandbox for plugins, don't install when requirements are not passed
* load items & weapons on install, preferably with ajax
* add changelog management interface
1.0:
* i18n support (issue #1 on github)
* New Admin Panel layout and interface
* add changelog management interface
* remove tibiacom template, and include it as a plugin
2.0
@ -30,3 +31,4 @@ At any time between (version not specified):
* preferably configurable (enable/disable) forum TinyMCE editor
* OTAdmin support in Admin Panel
* database towns table support for TFS 1.3
* two factor authentication for TFS 1.x

2
config.php
View File

@ -75,7 +75,7 @@ $config = array(
// images
'outfit_images_url' => 'http://outfit-images.ots.me/outfit.php', // set to animoutfit.php for animated outfit
'item_images_url' => 'http://item-images.ots.me/960/', // set to images/items if you host your own items in images folder
'item_images_url' => 'http://item-images.ots.me/1092/', // set to images/items if you host your own items in images folder
// account
'account_management' => true, // disable if you're using other method to manage users (fe. tfs account manager)

75
system/libs/plugins.php
View File

@ -93,32 +93,66 @@ class Plugins {
if(isset($plugin['require'])) {
$require = $plugin['require'];
if(isset($require['myaac'])) {
$myaac_satified = true;
if(isset($require['myaac_'])) {
$require_myaac = $require['myaac_'];
if(!Composer\Semver\Semver::satisfies(MYAAC_VERSION, $require_myaac)) {
$myaac_satified = false;
}
}
else if(isset($require['myaac'])) {
$require_myaac = $require['myaac'];
if(!self::satisfies(MYAAC_VERSION, $require_myaac)) {
if(version_compare(MYAAC_VERSION, $require_myaac, '<')) {
$myaac_satified = false;
}
}
if(!$myaac_satified) {
self::$error = "Your AAC version doesn't meet the requirement of this plugin. Required version is: " . $require_myaac . ", and you're using version " . MYAAC_VERSION . ".";
$continue = false;
}
$php_satified = true;
if(isset($require['php_'])) {
$require_php = $require['php_'];
if(!Composer\Semver\Semver::satisfies(phpversion(), $require_php)) {
$php_satified = false;
}
}
else if(isset($require['php'])) {
$require_php = $require['php'];
if(version_compare(phpversion(), $require_php, '<')) {
$php_satified = false;
}
}
if(isset($require['php'])) {
$require_php = $require['php'];
if(!self::satisfies(phpversion(), $require_php)) {
if(!$php_satified) {
self::$error = "Your PHP version doesn't meet the requirement of this plugin. Required version is: " . $require_php . ", and you're using version " . phpversion() . ".";
$continue = false;
}
$database_satified = true;
if(isset($require['database_'])) {
$require_database = $require['database_'];
if(!Composer\Semver\Semver::satisfies(DATABASE_VERSION, $require_database)) {
$database_satified = false;
}
}
else if(isset($require['database'])) {
$require_database = $require['database'];
if(version_compare(DATABASE_VERSION, $require_database, '<')) {
$database_satified = false;
}
}
if(isset($require['database'])) {
$require_database = $require['database'];
if(!self::satisfies(DATABASE_VERSION, $require_database)) {
if(!$database_satified) {
self::$error = "Your database version doesn't meet the requirement of this plugin. Required version is: " . $require_database . ", and you're using version " . DATABASE_VERSION . ".";
$continue = false;
}
}
foreach($require as $req => $version) {
if(in_array($req, array('myaac', 'php', 'database'))) {
if(in_array($req, array('myaac', 'myaac_', 'php', 'php_', 'database', 'database_'))) {
continue;
}
@ -253,26 +287,7 @@ class Plugins {
return false;
}
return self::satisfies($plugin_info['version'], $version);
}
public static function satisfies($version, $constraints) {
$is_semver = false;
$array = array(',', '>', '<', '=', '*', '|', '~');
foreach($array as $x) {
if(strpos($constraints, $x) !== false) {
$is_semver = true;
}
}
if($is_semver && !Composer\Semver\Semver::satisfies($version, $constraints)) {
return false;
}
else if(version_compare($version, $constraints, '<')) {
return false;
}
return true;
return Composer\Semver\Semver::satisfies($plugin_info['version'], $version);
}
public static function getWarnings() {