Merge remote branch 'origin/platal-1.0.0'

[platal.git] / include / security.inc.php

diff --git a/include/security.inc.php b/include/security.inc.php
index c909f2d..2f77f82 100644 (file)
--- a/include/security.inc.php
+++ b/include/security.inc.php
@@ -67,7 +67,7 @@ function check_ip($level)
 function check_email($email, $message)
 {
     $res = XDB::query("SELECT state, description
-        FROM emails_watch
+        FROM email_watch
         WHERE state != 'safe' AND email = {?}", $email);
     if ($res->numRows()) {
         send_warning_mail($message);
@@ -78,7 +78,10 @@ function check_email($email, $message)
 
 function check_account()
 {
-    return S::v('watch_account');
+    if (S::user()) {
+        return S::user()->watch;
+    }
+    return false;
 }
 
 function check_redirect($red = null)