Normalize whitespace in RSS module

This commit is contained in:
Kijin Sung 2023-06-19 02:16:42 +09:00
parent 87f798f94f
commit a30b7b6259
6 changed files with 78 additions and 78 deletions

View file

@ -10,7 +10,7 @@ class rssAdminController extends rss
function init()
{
}
/**
* configuration
*/
@ -18,7 +18,7 @@ class rssAdminController extends rss
{
$vars = Context::getRequestVars();
$config = getModel('rss')->getConfig();
if($img_file = $vars->image)
{
// Delete image file
@ -26,22 +26,22 @@ class rssAdminController extends rss
{
FileHandler::removeFile($config->image);
}
$vars->image = '';
// Upload image file
if($img_file['tmp_name'] && is_uploaded_file($img_file['tmp_name']))
{
$path = 'files/attach/images/rss';
$file_ext = strtolower(array_pop(explode('.', $img_file['name'])));
$file_name = sprintf('%s/feed_image.%s', $path, $file_ext);
// If file exists, delete
if(file_exists($file_name))
{
FileHandler::removeFile($file_name);
}
// Check image file extension
if(!in_array($file_ext, array('jpg', 'jpeg', 'gif', 'png')))
{
@ -59,7 +59,7 @@ class rssAdminController extends rss
}
}
}
if(!in_array($vars->use_total_feed, array('Y','N')))
{
$vars->open_rss = 'Y';
@ -69,9 +69,9 @@ class rssAdminController extends rss
{
$vars->feed_document_count = 20;
}
getController('module')->updateModuleConfig('rss', $vars);
if(isset($msg['error']))
{
throw new Rhymix\Framework\Exception($msg['error']);
@ -80,17 +80,17 @@ class rssAdminController extends rss
{
$this->setMessage(isset($msg) ? $msg : 'success_updated');
}
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex'));
}
/**
* Part configuration
*/
function procRssAdminInsertModuleConfig()
{
$vars = Context::getRequestVars();
if($vars->target_module_srl)
{
$target_module_srls = explode(',', $vars->target_module_srl);
@ -99,19 +99,19 @@ class rssAdminController extends rss
{
$target_module_srls = array_keys($vars->open_rss ?: []);
}
if(!count($target_module_srls))
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
foreach($target_module_srls as $module_srl)
{
if(!$module_srl = intval($module_srl))
{
continue;
}
$config = new stdClass;
if(isset($vars->open_rss[$module_srl]))
{
@ -126,7 +126,7 @@ class rssAdminController extends rss
$config->feed_description = $vars->feed_description;
$config->feed_copyright = $vars->feed_copyright;
}
if(!in_array($config->open_rss, array('Y', 'H', 'N')))
{
$config->open_rss = 'N';
@ -135,14 +135,14 @@ class rssAdminController extends rss
{
$config->open_total_feed = 'T_N';
}
getController('module')->updateModulePartConfig('rss', $module_srl, $config);
}
$this->setMessage('success_updated');
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex'));
}
function procRssAdminDeleteFeedImage()
{
$config = getModel('rss')->getConfig();
@ -150,13 +150,13 @@ class rssAdminController extends rss
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
FileHandler::removeFile($config->image);
$config->image = '';
getController('module')->insertModuleConfig('rss', $config);
}
/**
* Compatible function
*/
@ -165,7 +165,7 @@ class rssAdminController extends rss
getController('module')->insertModuleConfig('rss', $config);
return new BaseObject();
}
/**
* Compatible function
*/
@ -174,7 +174,7 @@ class rssAdminController extends rss
$config = new stdClass;
$config->open_rss = $open_rss;
$config->open_total_feed = $open_total_feed;
if($feed_description != 'N')
{
$config->feed_description = $feed_description;
@ -183,7 +183,7 @@ class rssAdminController extends rss
{
$config->feed_copyright = $feed_copyright;
}
getController('module')->insertModulePartConfig('rss', $module_srl, $config);
return new BaseObject();
}