Rework log and message helpers to be parallel, but separate.

1) they now have their own matching severity constants
2) they both have convenience functions success(), info(), warning() and error()
3) they both have severity_class()

4 files changed, 14 insertions, 14 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index f7f475cf..8e2fec0a 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -34,8 +34,8 @@ class Admin_Users_Controller extends Controller {
                            $form->add_user->full_name->value, $form->add_user->password->value);
       $user->email = $form->add_user->email->value;
       $user->save();
-      log::add("user", sprintf(_("Created user %s"), $user->name));
-      message::add(sprintf(_("Created user %s"), $user->name));
+      log::success("user", sprintf(_("Created user %s"), $user->name));
+      message::success(sprintf(_("Created user %s"), $user->name));
       $output = '<li>' . $user->name . ' <a href="#">edit</a><div>' .
         user::get_edit_form_admin($user) . '</div><a href="#">delete</a><div>' .
         user::get_delete_form_admin($user, "admin/users/delete/{$user->id}") .
@@ -62,8 +62,8 @@ class Admin_Users_Controller extends Controller {
       $name = $user->name;
       $user->delete();
 
-      log::add("user", sprintf(_("Deleted user %s"), $name));
-      message::add(sprintf(_("Deleted user %s"), $name));
+      log::success("user", sprintf(_("Deleted user %s"), $name));
+      message::success(sprintf(_("Deleted user %s"), $name));
       url::redirect("admin/users");
     }
 
@@ -83,7 +83,7 @@ class Admin_Users_Controller extends Controller {
       $user->password = $form->edit_user->password->value;
       $user->email = $form->edit_user->email->value;
       $user->save();
-      message::add(sprintf(_("Changed user %s"), $user->name));
+      message::success(sprintf(_("Changed user %s"), $user->name));
       url::redirect("admin/users");
     }
 
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 48527a41..0abd021b 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -33,8 +33,8 @@ class Login_Controller extends Controller {
     if ($valid) {
       $user = ORM::factory("user")->where("name", $form->login->inputs["name"]->value)->find();
       if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) {
-        log::add("user", sprintf(_("Failed login for %s"), $form->login->inputs["name"]->value),
-                 log::WARNING);
+        log::warning(
+          "user", sprintf(_("Failed login for %s"), $form->login->inputs["name"]->value));
         $form->login->inputs["name"]->add_error("invalid_login", 1);
         $valid = false;
       }
@@ -42,7 +42,7 @@ class Login_Controller extends Controller {
 
     if ($valid) {
       user::login($user);
-      log::add("user", "User $user->name logged in");
+      log::success("user", sprintf(_("User %s logged in"), $user->name));
       print json_encode(
         array("result" => "success"));
     } else {
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 5f4057af..e0da9a9f 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -21,8 +21,8 @@ class Logout_Controller extends Controller {
   public function index() {
     $user = user::active();
     user::logout();
-    log::add("user", "User $user->name logged out",
-             log::INFO, html::anchor("user/$user->id", $user->name));
+    log::info("user", sprintf(_("User %s logged out"), $user->name),
+              html::anchor("user/$user->id", $user->name));
     if ($this->input->get("continue")) {
       url::redirect($this->input->get("continue"));
     }
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index d1c9026d..fa17ba8c 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -25,15 +25,15 @@ class Admin_Watermarks_Controller extends Admin_Controller {
       $pathinfo = pathinfo($file);
       $name = preg_replace("/uploadfile-[^-]+-(.*)/", '$1', $pathinfo["basename"]);
       if (ORM::factory("watermark")->where("name", $name)->count_all() > 0) {
-        message::add(_("There is already a watermark with that name"), log::WARNING);
+        message::error(_("There is already a watermark with that name"));
       } else if (!($image_info = getimagesize($file))) {
-        message::add(_("An error occurred while saving this watermark"), log::WARNING);
+        message::warning(_("An error occurred while saving this watermark"));
       } else {
         if (empty($pathinfo["extension"])) {
           $name .= "." . image_type_to_extension($image_info[2]);
         }
         if (!rename($file, VARPATH . "modules/watermark/$name")) {
-          message::add(_("An error occurred while saving this watermark"), log::WARNING);
+          message::warning(_("An error occurred while saving this watermark"));
         } else {
           $watermark = ORM::factory("watermark");
           $watermark->name = $name;
@@ -42,7 +42,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
           $watermark->mime_type = $image_info["mime"];
           $watermark->save();
 
-          message::add(_("Watermark saved"));
+          message::success(_("Watermark saved"));
           url::redirect("admin/watermarks");
         }
       }