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/core/controllers/admin_modules.php b/core/controllers/admin_modules.php
index 152e49c3..c416a699 100644
--- a/core/controllers/admin_modules.php
+++ b/core/controllers/admin_modules.php
@@ -34,10 +34,10 @@ class Admin_Modules_Controller extends Admin_Controller {
       $desired = $this->input->post($module_name) == 1;
       if ($info->installed && !$desired) {
         module::uninstall($module_name);
-        message::add(sprintf(_("Uninstalled %s module"), $info->name));
+        message::success(sprintf(_("Uninstalled %s module"), $info->name));
       } else if (!$info->installed && $desired) {
         module::install($module_name);
-        message::add(sprintf(_("Installed %s module"), $info->name));
+        message::success(sprintf(_("Installed %s module"), $info->name));
       }
     }
     url::redirect("admin/modules");
diff --git a/core/controllers/albums.php b/core/controllers/albums.php
index 47412dfc..61d6ad22 100644
--- a/core/controllers/albums.php
+++ b/core/controllers/albums.php
@@ -79,9 +79,9 @@ class Albums_Controller extends Items_Controller {
         $this->input->post("description"),
         user::active()->id);
 
-      log::add("content", "Created an album", log::INFO,
+      log::success("content", "Created an album",
                html::anchor("albums/$new_album->id", "view album"));
-      message::add(_("Successfully created album"));
+      message::success(sprintf(_("Created album %s"), $new_album->title));
 
       print json_encode(
         array("result" => "success",
@@ -107,9 +107,9 @@ class Albums_Controller extends Items_Controller {
         $this->input->post("description"),
         user::active()->id);
 
-      log::add("content", "Added a photo", log::INFO,
+      log::success("content", "Added a photo",
                html::anchor("photos/$photo->id", "view photo"));
-      message::add(_("Successfully added photo"));
+      message::add(sprintf(_("Added photo %s"), $photo->title));
 
       print json_encode(
         array("result" => "success",
@@ -139,8 +139,8 @@ class Albums_Controller extends Items_Controller {
 
       module::event("album_changed", $album);
 
-      log::add("content", "Updated album", log::INFO, "<a href=\"albums/$album->id\">view</a>");
-      message::add(_("Successfully saved album"));
+      log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
+      message::success(sprintf(_("Saved album %s"), $album->title));
 
       print json_encode(
         array("result" => "success",
diff --git a/core/controllers/photos.php b/core/controllers/photos.php
index 04553bd1..13185283 100644
--- a/core/controllers/photos.php
+++ b/core/controllers/photos.php
@@ -56,8 +56,8 @@ class Photos_Controller extends Items_Controller {
 
       module::event("photo_changed", $photo);
 
-      log::add("content", "Updated photo", log::INFO, "<a href=\"photos/$photo->id\">view</a>");
-      message::add(_("Successfully saved photo"));
+      log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
+      message::success(sprintf(_("Saved photo %s"), $photo->title));
 
       print json_encode(
         array("result" => "success",
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index a5c8c9d6..637ab642 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -206,8 +206,8 @@ class Welcome_Controller extends Template_Controller {
     }
 
     if ($photo_count > 0) {
-      log::add("content", "(scaffold) Added $photo_count photos", log::INFO,
-               html::anchor("albums/$parent_id", "View album"));
+      log::success("content", "(scaffold) Added $photo_count photos"
+                   html::anchor("albums/$parent_id", "View album"));
     }
 
     url::redirect("welcome");
@@ -245,11 +245,11 @@ class Welcome_Controller extends Template_Controller {
     }
 
     if ($photo_count > 0) {
-      log::add("content", "(scaffold) Added $photo_count photos");
+      log::success("content", "(scaffold) Added $photo_count photos");
     }
 
     if ($album_count > 0) {
-      log::add("content", "(scaffold) Added $album_count albums");
+      log::success("content", "(scaffold) Added $album_count albums");
     }
     url::redirect("welcome");
   }