introducing Logger::log

[friendica.git] / src / Core / Update.php

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 557d854c8c606d4d78c655b447a00cac81a65db3..b9f3f3d1c9fdc985ec9d83c570b1ee5dd0195f14 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -163,7 +163,7 @@ class Update
                                }
                        }
                } else {
-                       logger('Skipping \'' . $funcname . '\' without executing', LOGGER_DEBUG);
+                        Logger::log('Skipping \'' . $funcname . '\' without executing', Logger::DEBUG);
 
                        Config::set('database', 'last_successful_update_function', $funcname);
                        Config::set('database', 'last_successful_update_function_time', time());
@@ -185,13 +185,11 @@ class Update
        private static function updateFailed($update_id, $error_message) {
                //send the administrators an e-mail
                $admin_mail_list = "'".implode("','", array_map(['Friendica\Database\DBA', 'escape'], explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))))."'";
-               $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
-                       $admin_mail_list
-               );
+               $adminlist = DBA::select('user', ['uid', 'language', 'email'], ['`email` IN (%s)', $admin_mail_list]);
 
                // No valid result?
                if (!DBA::isResult($adminlist)) {
-                       logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_INFO);
+                       Logger::log(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), Logger::INFO);
 
                        // Don't continue
                        return;
@@ -222,16 +220,14 @@ class Update
                }
 
                //try the logger
-               logger("CRITICAL: Database structure update failed: ".$error_message);
+               Logger::log("CRITICAL: Database structure update failed: " . $error_message);
        }
 
        private static function updateSuccessfull($from_build, $to_build)
        {
                //send the administrators an e-mail
                $admin_mail_list = "'".implode("','", array_map(['Friendica\Database\DBA', 'escape'], explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))))."'";
-               $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
-                       $admin_mail_list
-               );
+               $adminlist = DBA::select('user', ['uid', 'language', 'email'], ['`email` IN (%s)', $admin_mail_list]);
 
                if (DBA::isResult($adminlist)) {
                        // every admin could had different language
@@ -256,6 +252,6 @@ class Update
                }
 
                //try the logger
-               logger("CRITICAL: Database structure update successful.", LOGGER_TRACE);
+               Logger::log("Database structure update successful.", Logger::TRACE);
        }
 }