mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 01:01:41 +09:00
Remove trailing whitespace
This commit is contained in:
Kijin Sung
parent
c5267b42fd
commit
37b0d3a1e6
71 changed files with 806 additions and 806 deletions
|
|
@ -18,7 +18,7 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
// Get current config
|
||||
$config = ModuleModel::getModuleConfig('spamfilter') ?: new stdClass;
|
||||
|
||||
|
||||
// Get the default information
|
||||
$args = Context::gets('limits', 'limits_interval', 'limits_count', 'ipv4_block_range', 'ipv6_block_range', 'custom_message');
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
// Get current config
|
||||
$config = ModuleModel::getModuleConfig('spamfilter') ?: new stdClass;
|
||||
|
||||
|
||||
// Get updated values
|
||||
$vars = Context::getRequestVars();
|
||||
if (!isset($vars->target_devices) || !is_array($vars->target_devices))
|
||||
|
|
@ -71,7 +71,7 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
$vars->target_actions = [];
|
||||
}
|
||||
|
||||
|
||||
// Check values
|
||||
if (!isset($config->captcha))
|
||||
{
|
||||
|
|
@ -84,7 +84,7 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
return new BaseObject(-1, 'msg_recaptcha_keys_not_set');
|
||||
}
|
||||
|
||||
|
||||
$config->captcha->theme = escape(utf8_trim($vars->captcha_theme));
|
||||
$config->captcha->size = escape(utf8_trim($vars->captcha_size));
|
||||
$config->captcha->target_devices = [
|
||||
|
|
@ -100,7 +100,7 @@ class spamfilterAdminController extends spamfilter
|
|||
];
|
||||
$config->captcha->target_users = escape(utf8_trim($vars->target_users)) ?: 'non_members';
|
||||
$config->captcha->target_frequency = escape(utf8_trim($vars->target_frequency)) ?: 'first_time_only';
|
||||
|
||||
|
||||
// Insert new config
|
||||
$output = getController('module')->insertModuleConfig('spamfilter', $config);
|
||||
if(!$output->toBool())
|
||||
|
|
@ -112,7 +112,7 @@ class spamfilterAdminController extends spamfilter
|
|||
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigCaptcha');
|
||||
$this->setRedirectUrl($returnUrl);
|
||||
}
|
||||
|
||||
|
||||
public function procSpamfilterAdminInsertDeniedIP()
|
||||
{
|
||||
//스팸IP 추가
|
||||
|
|
@ -130,7 +130,7 @@ class spamfilterAdminController extends spamfilter
|
|||
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedIPList');
|
||||
$this->setRedirectUrl($returnUrl);
|
||||
}
|
||||
|
||||
|
||||
public function procSpamfilterAdminUpdateDeniedIP()
|
||||
{
|
||||
$ipaddress = Context::get('ipaddress');
|
||||
|
|
@ -138,10 +138,10 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
throw new Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$args = new \stdClass;
|
||||
$args->ipaddress = $ipaddress;
|
||||
|
||||
|
||||
$except_member = Context::get('except_member');
|
||||
if (!empty($except_member))
|
||||
{
|
||||
|
|
@ -151,13 +151,13 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
throw new Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$output = executeQuery('spamfilter.updateDeniedIPAttributes', $args);
|
||||
if (!$output->toBool())
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
Rhymix\Framework\Cache::delete('spamfilter:denied_ip_list');
|
||||
}
|
||||
|
||||
|
|
@ -196,36 +196,36 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
throw new Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$args = new \stdClass;
|
||||
$args->word = $word;
|
||||
|
||||
|
||||
$except_member = Context::get('except_member');
|
||||
if (!empty($except_member))
|
||||
{
|
||||
$args->except_member = $except_member === 'Y' ? 'Y' : 'N';
|
||||
}
|
||||
|
||||
|
||||
$filter_html = Context::get('filter_html');
|
||||
if (!empty($filter_html))
|
||||
{
|
||||
$args->filter_html = $filter_html === 'Y' ? 'Y' : 'N';
|
||||
}
|
||||
|
||||
|
||||
if (!isset($args->except_member) && !isset($args->filter_html))
|
||||
{
|
||||
throw new Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$output = executeQuery('spamfilter.updateDeniedWordAttributes', $args);
|
||||
if (!$output->toBool())
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
Rhymix\Framework\Cache::delete('spamfilter:denied_word_list');
|
||||
}
|
||||
|
||||
|
||||
public function procSpamfilterAdminDeleteDeniedWord()
|
||||
{
|
||||
$wordList = Context::get('word');
|
||||
|
|
@ -248,7 +248,7 @@ class spamfilterAdminController extends spamfilter
|
|||
$args = new stdClass;
|
||||
$args->ipaddress = $ipaddress;
|
||||
$output = executeQuery('spamfilter.deleteDeniedIP', $args);
|
||||
|
||||
|
||||
Rhymix\Framework\Cache::delete('spamfilter:denied_ip_list');
|
||||
return $output;
|
||||
}
|
||||
|
|
@ -281,12 +281,12 @@ class spamfilterAdminController extends spamfilter
|
|||
{
|
||||
$description = null;
|
||||
}
|
||||
|
||||
|
||||
if (mb_strlen($word, 'UTF-8') < 2 || mb_strlen($word, 'UTF-8') > 180)
|
||||
{
|
||||
throw new Rhymix\Framework\Exception('msg_invalid_word');
|
||||
}
|
||||
|
||||
|
||||
$args = new stdClass;
|
||||
$args->word = $word;
|
||||
$args->description = $description;
|
||||
|
|
@ -297,12 +297,12 @@ class spamfilterAdminController extends spamfilter
|
|||
$fail_list .= $args->word . '<br />';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($output)
|
||||
{
|
||||
$output->add('fail_list', $fail_list);
|
||||
}
|
||||
|
||||
|
||||
Rhymix\Framework\Cache::delete('spamfilter:denied_word_list');
|
||||
return $output;
|
||||
}
|
||||
|
|
@ -317,7 +317,7 @@ class spamfilterAdminController extends spamfilter
|
|||
$args = new stdClass;
|
||||
$args->word = $word;
|
||||
$output = executeQuery('spamfilter.deleteDeniedWord', $args);
|
||||
|
||||
|
||||
Rhymix\Framework\Cache::delete('spamfilter:denied_word_list');
|
||||
return $output;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* @author NAVER (developers@xpressengine.com)
|
||||
* @brief The admin view class of the spamfilter module
|
||||
*/
|
||||
class spamfilterAdminView extends spamfilter
|
||||
class spamfilterAdminView extends spamfilter
|
||||
{
|
||||
/**
|
||||
* @brief Initialization
|
||||
|
|
@ -27,7 +27,7 @@ class spamfilterAdminView extends spamfilter
|
|||
{
|
||||
$sort_index = 'regdate';
|
||||
}
|
||||
|
||||
|
||||
// Get the list of denied IP addresses and words
|
||||
$oSpamFilterModel = getModel('spamfilter');
|
||||
$ip_list = $oSpamFilterModel->getDeniedIPList($sort_index);
|
||||
|
|
@ -52,7 +52,7 @@ class spamfilterAdminView extends spamfilter
|
|||
{
|
||||
$sort_index = 'hit';
|
||||
}
|
||||
|
||||
|
||||
// Get the list of denied IP addresses and words
|
||||
$oSpamFilterModel = getModel('spamfilter');
|
||||
$word_list = $oSpamFilterModel->getDeniedWordList($sort_index);
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ class spamfilter extends ModuleObject
|
|||
array('communication.sendMessage', 'before', 'controller', 'triggerSendMessage'),
|
||||
array('moduleObject.proc', 'before', 'controller', 'triggerCheckCaptcha'),
|
||||
);
|
||||
|
||||
|
||||
protected static $_delete_triggers = array(
|
||||
array('trackback.insertTrackback', 'before', 'controller', 'triggerInsertTrackback'),
|
||||
);
|
||||
|
||||
|
||||
/**
|
||||
* Register all triggers.
|
||||
*
|
||||
*
|
||||
* @return object
|
||||
*/
|
||||
public function registerTriggers()
|
||||
|
|
@ -45,7 +45,7 @@ class spamfilter extends ModuleObject
|
|||
}
|
||||
return new BaseObject(0, 'success_updated');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Additional tasks required to accomplish during the installation
|
||||
*/
|
||||
|
|
@ -73,7 +73,7 @@ class spamfilter extends ModuleObject
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$oDB = DB::getInstance();
|
||||
if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
|
||||
if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
|
||||
|
|
@ -85,13 +85,13 @@ class spamfilter extends ModuleObject
|
|||
if(!$oDB->isColumnExists('spamfilter_denied_ip', 'latest_hit')) return true;
|
||||
if(!$oDB->isColumnExists('spamfilter_denied_ip', 'except_member')) return true;
|
||||
if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
|
||||
|
||||
|
||||
$config = ModuleModel::getModuleConfig('spamfilter') ?: new stdClass;
|
||||
if (!isset($config->captcha))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -105,7 +105,7 @@ class spamfilter extends ModuleObject
|
|||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
$oDB = DB::getInstance();
|
||||
if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit'))
|
||||
{
|
||||
|
|
@ -152,7 +152,7 @@ class spamfilter extends ModuleObject
|
|||
{
|
||||
$oDB->addColumn('spamfilter_denied_ip', 'description', 'varchar', 191, null, false, 'except_member');
|
||||
}
|
||||
|
||||
|
||||
$config = ModuleModel::getModuleConfig('spamfilter') ?: new stdClass;
|
||||
if (!isset($config->captcha))
|
||||
{
|
||||
|
|
@ -167,7 +167,7 @@ class spamfilter extends ModuleObject
|
|||
$config->captcha = new stdClass;
|
||||
$config->captcha->type = 'none';
|
||||
}
|
||||
|
||||
|
||||
$output = getController('module')->insertModuleConfig($this->module, $config);
|
||||
if (!$output->toBool())
|
||||
{
|
||||
|
|
@ -181,9 +181,9 @@ class spamfilter extends ModuleObject
|
|||
*/
|
||||
public function recompileCache()
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Import configuration from reCAPTCHA addon.
|
||||
*/
|
||||
|
|
@ -195,7 +195,7 @@ class spamfilter extends ModuleObject
|
|||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
if ($config->use_pc === 'Y' || $config->use_mobile === 'Y')
|
||||
{
|
||||
$output->type = 'recaptcha';
|
||||
|
|
@ -222,7 +222,7 @@ class spamfilter extends ModuleObject
|
|||
$output->target_modules[$module_srl] = true;
|
||||
}
|
||||
$output->target_modules_type = ($config->xe_run_method === 'run_selected') ? '+' : '-';
|
||||
|
||||
|
||||
$oAddonAdminController = getAdminController('addon');
|
||||
if ($output->target_devices['pc'])
|
||||
{
|
||||
|
|
@ -234,7 +234,7 @@ class spamfilter extends ModuleObject
|
|||
$oAddonAdminController->doDeactivate('recaptcha', 0, 'mobile');
|
||||
$oAddonAdminController->makeCacheFile(0, 'mobile');
|
||||
}
|
||||
|
||||
|
||||
return $output;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ class spamfilterController extends spamfilter
|
|||
}
|
||||
else
|
||||
{
|
||||
$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;
|
||||
$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;
|
||||
}
|
||||
$output = $oFilterModel->isDeniedWord($text);
|
||||
if(!$output->toBool()) return $output;
|
||||
|
|
@ -141,14 +141,14 @@ class spamfilterController extends spamfilter
|
|||
}
|
||||
$fail_list = '';
|
||||
$output = null;
|
||||
|
||||
|
||||
foreach ($ipaddress_list as $ipaddress)
|
||||
{
|
||||
if ($ipaddress === '')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$args = new stdClass;
|
||||
if (preg_match('@^(.+?)(?://|#)(.*)$@', $ipaddress, $matches))
|
||||
{
|
||||
|
|
@ -160,24 +160,24 @@ class spamfilterController extends spamfilter
|
|||
$args->ipaddress = $ipaddress;
|
||||
$args->description = $description;
|
||||
}
|
||||
|
||||
|
||||
if (!Rhymix\Framework\Filters\IpFilter::validateRange($args->ipaddress))
|
||||
{
|
||||
return new BaseObject(-1, 'msg_invalid_ip');
|
||||
}
|
||||
|
||||
|
||||
$output = executeQuery('spamfilter.insertDeniedIP', $args);
|
||||
if (!$output->toBool())
|
||||
{
|
||||
$fail_list .= $args->ipaddress . '<br />';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($output)
|
||||
{
|
||||
$output->add('fail_list', $fail_list);
|
||||
}
|
||||
|
||||
|
||||
Rhymix\Framework\Cache::delete('spamfilter:denied_ip_list');
|
||||
return $output;
|
||||
}
|
||||
|
|
@ -210,7 +210,7 @@ class spamfilterController extends spamfilter
|
|||
// Save a log
|
||||
$this->insertLog();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief while document manager is running, stop filter
|
||||
*/
|
||||
|
|
@ -245,7 +245,7 @@ class spamfilterController extends spamfilter
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$target_actions = [];
|
||||
foreach (['signup', 'login', 'recovery', 'document', 'comment'] as $action)
|
||||
{
|
||||
|
|
@ -257,12 +257,12 @@ class spamfilterController extends spamfilter
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (count($target_actions))
|
||||
{
|
||||
include_once __DIR__ . '/spamfilter.lib.php';
|
||||
spamfilter_reCAPTCHA::init($config->captcha);
|
||||
|
||||
|
||||
if (strncasecmp('proc', $obj->act, 4) === 0)
|
||||
{
|
||||
spamfilter_reCAPTCHA::check();
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ class spamfilter_reCAPTCHA
|
|||
protected static $instances_inserted = 0;
|
||||
protected static $sequence = 1;
|
||||
protected $_target_actions = [];
|
||||
|
||||
|
||||
public static function init($config)
|
||||
{
|
||||
self::$config = $config;
|
||||
}
|
||||
|
||||
|
||||
public static function check()
|
||||
{
|
||||
$response = Context::get('g-recaptcha-response');
|
||||
|
|
@ -21,7 +21,7 @@ class spamfilter_reCAPTCHA
|
|||
{
|
||||
throw new Rhymix\Framework\Exception('msg_recaptcha_invalid_response');
|
||||
}
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
$verify_request = \Requests::post(self::$verify_url, array(), array(
|
||||
|
|
@ -34,7 +34,7 @@ class spamfilter_reCAPTCHA
|
|||
{
|
||||
throw new Rhymix\Framework\Exception('msg_recaptcha_connection_error');
|
||||
}
|
||||
|
||||
|
||||
$verify = @json_decode($verify_request->body, true);
|
||||
if (!$verify || !$verify['success'])
|
||||
{
|
||||
|
|
@ -44,10 +44,10 @@ class spamfilter_reCAPTCHA
|
|||
{
|
||||
throw new Rhymix\Framework\Exception('msg_recaptcha_invalid_response');
|
||||
}
|
||||
|
||||
|
||||
$_SESSION['recaptcha_authenticated'] = true;
|
||||
}
|
||||
|
||||
|
||||
public function addScripts()
|
||||
{
|
||||
if (!self::$scripts_added)
|
||||
|
|
@ -60,17 +60,17 @@ class spamfilter_reCAPTCHA
|
|||
Context::addHtmlFooter($html);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function setTargetActions(array $target_actions)
|
||||
{
|
||||
$this->_target_actions = $target_actions;
|
||||
}
|
||||
|
||||
|
||||
public function isTargetAction(string $action): bool
|
||||
{
|
||||
return isset($this->_target_actions[$action]);
|
||||
}
|
||||
|
||||
|
||||
public function __toString()
|
||||
{
|
||||
return sprintf('<div id="recaptcha-instance-%d" class="g-recaptcha"></div>', self::$instances_inserted++);
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ class spamfilterModel extends spamfilter
|
|||
$args = new stdClass();
|
||||
$args->ipaddress = $ip_range->ipaddress;
|
||||
executeQuery('spamfilter.updateDeniedIPHit', $args);
|
||||
|
||||
|
||||
return new BaseObject(-1, 'msg_alert_registered_denied_ip');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return new BaseObject();
|
||||
}
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ class spamfilterModel extends spamfilter
|
|||
$is_logged = Context::get('is_logged');
|
||||
$fulltext = strtolower(utf8_trim(utf8_normalize_spaces($text)));
|
||||
$plaintext = htmlspecialchars_decode(strip_tags($fulltext, '<a><img>'));
|
||||
|
||||
|
||||
foreach ($word_list as $word_item)
|
||||
{
|
||||
if (!empty($word_item->except_member) && $word_item->except_member === 'Y' && $is_logged)
|
||||
|
|
@ -150,7 +150,7 @@ class spamfilterModel extends spamfilter
|
|||
{
|
||||
$custom_message = sprintf($custom_message, escape($hit, false));
|
||||
}
|
||||
|
||||
|
||||
return new BaseObject(-1, $custom_message);
|
||||
}
|
||||
}
|
||||
|
|
@ -182,7 +182,7 @@ class spamfilterModel extends spamfilter
|
|||
{
|
||||
$suffix = $config->ipv6_block_range ?: '';
|
||||
}
|
||||
|
||||
|
||||
$oSpamFilterController = getController('spamfilter');
|
||||
$oSpamFilterController->insertIP(\RX_CLIENT_IP . $suffix, 'AUTO-DENIED : Over limit');
|
||||
return new BaseObject(-1, 'msg_alert_registered_denied_ip');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue