fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 09:14:48 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove trailing whitespace

Browse source
This commit is contained in:
Kijin Sung 2023-01-30 21:43:21 +09:00
parent c5267b42fd
commit 37b0d3a1e6
71 changed files with 806 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/addon/addon.admin.controller.php
View file

@ -143,7 +143,7 @@ class addonAdminController extends addonController
$this->makeCacheFile($site_srl, 'mobile', 'site');
Rhymix\Framework\Cache::clearGroup('addonConfig');
}
$this->setMessage('success_updated', 'info');
if(Context::get('success_return_url'))
{
@ -245,7 +245,7 @@ class addonAdminController extends addonController
{
$args->is_used = $isUsed === 'Y' ? 'Y' : 'N';
}
if($gtype == 'global')
{
$output = executeQuery('addon.insertAddon', $args);
@ -256,7 +256,7 @@ class addonAdminController extends addonController
$args->site_srl = $site_srl;
$output = executeQuery('addon.insertSiteAddon', $args);
}
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'any'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'pc'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'mobile'));
@ -293,7 +293,7 @@ class addonAdminController extends addonController
$args->site_srl = $site_srl;
$output = executeQuery('addon.updateSiteAddon', $args);
}
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'any'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'pc'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'mobile'));
@ -329,7 +329,7 @@ class addonAdminController extends addonController
$args->site_srl = $site_srl;
$output = executeQuery('addon.updateSiteAddon', $args);
}
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'any'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'pc'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'mobile'));
@ -338,4 +338,4 @@ class addonAdminController extends addonController
}
/* End of file addon.admin.controller.php */
/* Location: ./modules/addon/addon.admin.controller.php */
/* Location: ./modules/addon/addon.admin.controller.php */

14
modules/addon/addon.admin.model.php
View file

@ -48,7 +48,7 @@ class addonAdminModel extends addon
{
// check blacklist
$addonList[$key]->isBlacklisted = Context::isBlacklistedPlugin($addon->addon, 'addon');
// get easyinstall remove url
$packageSrl = $oAutoinstallModel->getPackageSrlByPath($addon->path);
$addonList[$key]->remove_url = $oAutoinstallModel->getRemoveUrlByPackageSrl($packageSrl);
@ -109,7 +109,7 @@ class addonAdminModel extends addon
$path = $this->getAddonPath($addon_name);
// Wanted information on the add-on
$info = $this->getAddonInfoXml($addon_name, $site_srl, $gtype);
if(!$info) $info = new stdClass();
$info->addon = $addon_name;
@ -331,16 +331,16 @@ class addonAdminModel extends addon
$addon_info->title = $xml_obj->title->body;
$addon_info->description = trim($xml_obj->author->description->body);
$addon_info->version = $xml_obj->attrs->version;
$date_obj = new stdClass();
sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
$addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$author_obj = new stdClass();
$author_obj->name = $xml_obj->author->name->body;
$author_obj->email_address = $xml_obj->author->attrs->email_address;
$author_obj->homepage = $xml_obj->author->attrs->link;
$addon_info->author = array();
$addon_info->author[] = $author_obj;
@ -462,7 +462,7 @@ class addonAdminModel extends addon
);
$always_return_false_for_compatibility = array(
);
if(isset($always_return_true_for_compatibility[$addon]))
{
return true;
@ -471,7 +471,7 @@ class addonAdminModel extends addon
{
return false;
}
$args = new stdClass();
$args->addon = $addon;
if($gtype == 'global')

26
modules/addon/addon.controller.php
View file

@ -8,7 +8,7 @@
class addonController extends addon
{
public $addon_file_called = false;
/**
* Initialization
*
@ -78,41 +78,41 @@ class addonController extends addon
foreach($addon_list as $addon => $val)
{
if(Context::isBlacklistedPlugin($addon, 'addon')
|| ($type == "pc" && $val->is_used != 'Y')
|| ($type == "mobile" && $val->is_used_m != 'Y')
|| ($type == "pc" && $val->is_used != 'Y')
|| ($type == "mobile" && $val->is_used_m != 'Y')
|| ($gtype == 'global' && $val->is_fixed != 'Y')
|| !is_dir(RX_BASEDIR . 'addons/' . $addon))
{
continue;
}
$extra_vars = unserialize($val->extra_vars);
if(!$extra_vars)
{
$extra_vars = new stdClass;
}
$mid_list = $extra_vars->mid_list ?? [];
if(!is_array($mid_list))
{
$mid_list = array();
}
// Initialize
$buff[] = '$before_time = microtime(true);';
// Run method and mid list
$run_method = ($extra_vars->xe_run_method ?? null) ?: 'run_selected';
$buff[] = '$rm = \'' . $run_method . "';";
$buff[] = '$ml = ' . var_export(array_fill_keys($mid_list, true), true) . ';';
$buff[] = '$_m = Context::get(\'mid\');';
// Addon filename
$buff[] = sprintf('$addon_file = RX_BASEDIR . \'addons/%s/%s.addon.php\';', $addon, $addon);
// Addon configuration
$buff[] = '$addon_info = unserialize(' . var_export(serialize($extra_vars), true) . ');';
// Decide whether to run in this mid
if ($run_method === 'no_run_selected')
{
@ -126,7 +126,7 @@ class addonController extends addon
{
$buff[] = '$run = isset($ml[$_m]);';
}
// Write debug info
$buff[] = 'if ($run && file_exists($addon_file)):';
$buff[] = ' include($addon_file);';
@ -142,7 +142,7 @@ class addonController extends addon
$buff[] = 'endif;';
$buff[] = '';
}
// Write file in new location
$addon_file = RX_BASEDIR . 'files/cache/addons/' . $type . '.php';
FileHandler::writeFile($addon_file, join(PHP_EOL, $buff));
@ -176,7 +176,7 @@ class addonController extends addon
$args->site_srl = $site_srl;
$output = executeQuery('addon.updateSiteAddon', $args);
}
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'any'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'pc'));
Rhymix\Framework\Cache::delete(sprintf('addonConfig:%s:%s', $addon, 'mobile'));

12
modules/addon/addon.model.php
View file

@ -4,7 +4,7 @@ class AddonModel extends Addon
{
/**
* Get configuration for addon
*
*
* @param string $addon_name
* @param string $type
* @return object|null
@ -15,14 +15,14 @@ class AddonModel extends Addon
{
$type = 'any';
}
$cache_key = sprintf('addonConfig:%s:%s', $addon_name, $type);
$config = Rhymix\Framework\Cache::get($cache_key);
if ($config !== null)
{
return $config;
}
$args = new stdClass();
$args->addon = $addon_name;
$args->site_srl = 0;
@ -31,7 +31,7 @@ class AddonModel extends Addon
{
return null;
}
$result = array_first($output->data);
if ($type === 'pc' && $result->is_used !== 'Y')
{
@ -45,7 +45,7 @@ class AddonModel extends Addon
{
return null;
}
$config = unserialize($result->extra_vars);
unset($config->xe_validator_id);
if (!isset($config->mid_list))
@ -54,7 +54,7 @@ class AddonModel extends Addon
}
$config->use_pc = $result->is_used;
$config->use_mobile = $result->is_used_m;
Rhymix\Framework\Cache::set($cache_key, $config, 0, true);
return $config;
}