From ec6559b8be301529d9a7951a5ea5fee7bc6df7fb Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 Jul 2016 15:54:05 -0400 Subject: [PATCH] - Removes unused method from Settings model - Renames method to delete value --- lib/Cron/CronHelper.php | 2 +- lib/Mailer/MailerLog.php | 40 ++++++++++++++++++++-------------------- lib/Models/Setting.php | 10 +++------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/lib/Cron/CronHelper.php b/lib/Cron/CronHelper.php index a03aa894ed..f64ff87c56 100644 --- a/lib/Cron/CronHelper.php +++ b/lib/Cron/CronHelper.php @@ -42,7 +42,7 @@ class CronHelper { } static function deleteDaemon() { - return Setting::deleteSetting(self::DAEMON_SETTING); + return Setting::deleteValue(self::DAEMON_SETTING); } static function createToken() { diff --git a/lib/Mailer/MailerLog.php b/lib/Mailer/MailerLog.php index 0e1244b714..c5c65bc0f6 100644 --- a/lib/Mailer/MailerLog.php +++ b/lib/Mailer/MailerLog.php @@ -8,30 +8,30 @@ if(!defined('ABSPATH')) exit; class MailerLog { const MAILER_LOG_CONFIG = 'mta_log'; - static function getMailerLog() { - $mailer_log = Setting::getValue(self::MAILER_LOG_CONFIG); - if(!$mailer_log) { - $mailer_log = self::createOrResetMailerLog(); + static function getMailerLog() { + $mailer_log = Setting::getValue(self::MAILER_LOG_CONFIG); + if(!$mailer_log) { + $mailer_log = self::createOrResetMailerLog(); + } + return $mailer_log; } - return $mailer_log; - } - static function createOrResetMailerLog() { - $mailer_log = array( - 'sent' => 0, - 'started' => time() - ); - Setting::setValue(self::MAILER_LOG_CONFIG, $mailer_log); - return $mailer_log; - } + static function createOrResetMailerLog() { + $mailer_log = array( + 'sent' => 0, + 'started' => time() + ); + Setting::setValue(self::MAILER_LOG_CONFIG, $mailer_log); + return $mailer_log; + } - static function updateMailerLog($mailer_log) { - Setting::setValue(self::MAILER_LOG_CONFIG, $mailer_log); - return $mailer_log; - } + static function updateMailerLog($mailer_log) { + Setting::setValue(self::MAILER_LOG_CONFIG, $mailer_log); + return $mailer_log; + } - static function isSendingLimitReached() { - $mailer_config = Mailer::getMailerConfig(); + static function isSendingLimitReached() { + $mailer_config = Mailer::getMailerConfig(); $mailer_log = self::getMailerLog(); $elapsed_time = time() - (int)$mailer_log['started']; if($mailer_log['sent'] === $mailer_config['frequency_limit'] && diff --git a/lib/Models/Setting.php b/lib/Models/Setting.php index 145c0a21c2..8f823f486f 100644 --- a/lib/Models/Setting.php +++ b/lib/Models/Setting.php @@ -161,12 +161,8 @@ class Setting extends Model { return $setting->save(); } - public static function getSetting($setting) { - return self::where('name', $setting)->findOne(); - } - - public static function deleteSetting($setting) { - $setting = self::where('name', $setting)->findOne(); - return ($setting) ? $setting->delete() : false; + public static function deleteValue($value) { + $value = self::where('name', $value)->findOne(); + return ($value) ? $value->delete() : false; } } \ No newline at end of file