5 files changed, 54 insertions, 14 deletions

diff --git a/modules/gallery/helpers/login.php b/modules/gallery/helpers/auth.php
index cb961604..9c69cecd 100644
--- a/modules/gallery/helpers/login.php
+++ b/modules/gallery/helpers/auth.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class login_Core {
-  static function get_form($url) {
+class auth_Core {
+  static function get_login_form($url) {
     $form = new Forge($url, "", "post", array("id" => "g-login-form"));
     $form->set_attr('class', "g-narrow");
     $group = $form->group("login")->label(t("Login"));
@@ -28,4 +28,29 @@ class login_Core {
     $group->submit("")->value(t("Login"));
     return $form;
   }
+
+  static function login($user) {
+    if (identity::is_writable()) {
+      $user->login_count += 1;
+      $user->last_login = time();
+      $user->save();
+    }
+    identity::set_active_user($user);
+    log::info("user", t("User %name logged in", array("name" => $user->name)));
+    module::event("user_login", $user);
+  }
+
+  static function logout() {
+    $user = identity::active_user();
+    if (!$user->guest) {
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        Kohana::log("error", $e);
+      }
+      module::event("user_logout", $user);
+    }
+    log::info("user", t("User %name logged out", array("name" => $user->name)),
+              html::anchor("user/$user->id", html::clean($user->name)));
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 87dee356..582e3267 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -28,6 +28,20 @@ class gallery_event_Core {
     locales::set_request_locale();
   }
 
+  static function user_deleted($user) {
+    $admin = identity::admin_user();
+    $db = Database::instance();
+    $db->query("UPDATE {tasks} SET owner_id = {$admin->id} where owner_id = {$user->id}");
+    $db->query("UPDATE {items} SET owner_id = {$admin->id} where owner_id = {$user->id}");
+  }
+
+  static function identity_provider_changed($old_provider, $new_provider) {
+    $admin = identity::admin_user();
+    $db = Database::instance();
+    $db->query("UPDATE {tasks} SET owner_id = {$admin->id}");
+    $db->query("UPDATE {items} SET owner_id = {$admin->id}");
+  }
+
   static function group_created($group) {
     access::add_group($group);
   }
@@ -165,7 +179,11 @@ class gallery_event_Core {
                ->append(Menu::factory("link")
                         ->id("advanced")
                         ->label(t("Advanced"))
-                        ->url(url::site("admin/advanced_settings"))))
+                        ->url(url::site("admin/advanced_settings")))
+               ->append(Menu::factory("link")
+                        ->id("identity_drivers")
+                        ->label(t("Identity drivers"))
+                        ->url(url::site("admin/identity"))))
       ->append(Menu::factory("link")
                ->id("modules")
                ->label(t("Modules"))
@@ -189,13 +207,6 @@ class gallery_event_Core {
                         ->label(t("Manage sidebar"))
                         ->url(url::site("admin/sidebar"))))
       ->append(Menu::factory("submenu")
-               ->id("identity_menu")
-               ->label(t("Identity management"))
-               ->append(Menu::factory("link")
-                        ->id("identity_drivers")
-                        ->label(t("Identity drivers"))
-                        ->url(url::site("admin/identity"))))
-      ->append(Menu::factory("submenu")
                ->id("statistics_menu")
                ->label(t("Statistics")))
       ->append(Menu::factory("link")
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 5daf1016..2eb02546 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -253,8 +253,6 @@ class gallery_installer {
       $theme->save();
     }
 
-    module::set_var("gallery", "identity_provider", "user");
-
     block_manager::add("dashboard_sidebar", "gallery", "block_adder");
     block_manager::add("dashboard_sidebar", "gallery", "stats");
     block_manager::add("dashboard_sidebar", "gallery", "platform_info");
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 1063c073..d6a2f00c 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -278,7 +278,10 @@ class graphics_Core {
       $toolkits->graphicsmagick->installed = false;
       $toolkits->graphicsmagick->error = t("GraphicsMagick requires the <b>exec</b> function");
     } else {
-      putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin:/opt/bin");
+      $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
+
+      putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
+             ":/usr/local/bin:/opt/local/bin:/opt/bin");
 
       // @todo: consider refactoring the two segments below into a loop since they are so
       // similar.
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 6dac0803..e84e8ea6 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -190,7 +190,10 @@ class movie_Core {
 
   static function find_ffmpeg() {
     if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
-      putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin:/opt/bin");
+      $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
+
+      putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
+             ":/usr/local/bin:/opt/local/bin:/opt/bin");
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
       }