Use config API

This commit is contained in:
Ingo Schommer 2015-11-20 12:07:07 +13:00
parent 81c7f2ba27
commit ea047df63d

View File

@ -29,17 +29,17 @@ class EnvironmentChecker extends RequestHandler {
/** /**
* @var null|string * @var null|string
*/ */
public static $to_email_address = null; private static $to_email_address = null;
/** /**
* @var null|string * @var null|string
*/ */
public static $from_email_address = null; private static $from_email_address = null;
/** /**
* @var bool * @var bool
*/ */
public static $email_results = false; private static $email_results = false;
/** /**
* @var bool Log results via {@link SS_Log} * @var bool Log results via {@link SS_Log}
@ -166,8 +166,8 @@ class EnvironmentChecker extends RequestHandler {
"ErrorCode" => $this->errorCode, "ErrorCode" => $this->errorCode,
))->renderWith("EnvironmentChecker"); ))->renderWith("EnvironmentChecker");
if (self::$email_results && !$result->ShouldPass()) { if ($this->config()->email_results && !$result->ShouldPass()) {
$email = new Email(self::$from_email_address, self::$to_email_address, $this->title, $resultText); $email = new Email($this->config()->from_email_address, $this->config()->to_email_address, $this->title, $resultText);
$email->send(); $email->send();
} }
@ -219,44 +219,56 @@ class EnvironmentChecker extends RequestHandler {
} }
/** /**
* @deprecated
* @param string $from * @param string $from
*/ */
public static function set_from_email_address($from) { public static function set_from_email_address($from) {
self::$from_email_address = $from; Deprecation::notice('2.0', 'Use config API instead');
Config::inst()->update('EnvironmentChecker', 'from_email_address', $from);
} }
/** /**
* @deprecated
* @return null|string * @return null|string
*/ */
public static function get_from_email_address() { public static function get_from_email_address() {
return self::$from_email_address; Deprecation::notice('2.0', 'Use config API instead');
return Config::inst()->get('EnvironmentChecker', 'from_email_address');
} }
/** /**
* @deprecated
* @param string $to * @param string $to
*/ */
public static function set_to_email_address($to) { public static function set_to_email_address($to) {
self::$to_email_address = $to; Deprecation::notice('2.0', 'Use config API instead');
Config::inst()->update('EnvironmentChecker', 'to_email_address', $to);
} }
/** /**
* @deprecated
* @return null|string * @return null|string
*/ */
public static function get_to_email_address() { public static function get_to_email_address() {
return self::$to_email_address; Deprecation::notice('2.0', 'Use config API instead');
return Config::inst()->get('EnvironmentChecker', 'to_email_address');
} }
/** /**
* @deprecated
* @param bool $results * @param bool $results
*/ */
public static function set_email_results($results) { public static function set_email_results($results) {
self::$email_results = $results; Deprecation::notice('2.0', 'Use config API instead');
Config::inst()->update('EnvironmentChecker', 'email_results', $results);
} }
/** /**
* @deprecated
* @return bool * @return bool
*/ */
public static function get_email_results() { public static function get_email_results() {
return self::$email_results; Deprecation::notice('2.0', 'Use config API instead');
return Config::inst()->get('EnvironmentChecker', 'email_results');
} }
} }