From 23bbc1680981d46f8e9c880a430934d488152a22 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 30 Jul 2009 10:34:00 -0700
Subject: [PATCH] Move keeporiginal menu code into keeporiginal_event

---
 .../helpers/keeporiginal_event.php            | 28 +++++++++++---
 .../helpers/keeporiginal_menu.php             | 38 -------------------
 2 files changed, 23 insertions(+), 43 deletions(-)
 delete mode 100644 modules/keeporiginal/helpers/keeporiginal_menu.php

diff --git a/modules/keeporiginal/helpers/keeporiginal_event.php b/modules/keeporiginal/helpers/keeporiginal_event.php
index 1d4e717b..3228c6f2 100644
--- a/modules/keeporiginal/helpers/keeporiginal_event.php
+++ b/modules/keeporiginal/helpers/keeporiginal_event.php
@@ -26,9 +26,9 @@ class keeporiginal_event_Core {
         unlink($original_file);
       }
     }
-    
-    // When deleting an album, make sure its corresponding location in 
-    //   VARPATH/original/ is deleted as well, if it exists. 
+
+    // When deleting an album, make sure its corresponding location in
+    //   VARPATH/original/ is deleted as well, if it exists.
     if ($item->is_album()) {
       $original_file = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item->file_path());
       if (file_exists($original_file)) {
@@ -36,10 +36,10 @@ class keeporiginal_event_Core {
       }
     }
   }
-  
+
   static function item_updated($old, $new) {
     // When updating an item, check and see if the file name is being changed.
-    //  If so, check for and modify any corresponding file/folder in 
+    //  If so, check for and modify any corresponding file/folder in
     //  VARPATH/original/ as well.
     if ($old->is_photo() || $old->is_album()) {
       if ($old->file_path() != $new->file_path()) {
@@ -51,4 +51,22 @@ class keeporiginal_event_Core {
       }
     }
   }
+
+  static function site_menu($menu, $theme) {
+    // Create a menu option to restore the original photo.
+    $item = $theme->item();
+
+    if ((access::can("view", $item)) && (access::can("edit", $item))) {
+      $original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item->file_path());
+
+      if ($item->is_photo() && file_exists($original_image)) {
+        $menu->get("options_menu")
+             ->append(Menu::factory("link")
+             ->id("restore")
+             ->label("Restore Original")
+             ->css_id("gKeepOriginalLink")
+             ->url(url::site("keeporiginal/restore/" . $item->id)));
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/modules/keeporiginal/helpers/keeporiginal_menu.php b/modules/keeporiginal/helpers/keeporiginal_menu.php
deleted file mode 100644
index 7f88f9d4..00000000
--- a/modules/keeporiginal/helpers/keeporiginal_menu.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class keeporiginal_menu_Core {
-  static function site($menu, $theme) {
-    // Create a menu option to restore the original photo.
-    $item = $theme->item();
-
-    if ((access::can("view", $item)) && (access::can("edit", $item))) {
-      $original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item->file_path());
-
-      if ($item->is_photo() && file_exists($original_image)) {
-        $menu->get("options_menu")
-             ->append(Menu::factory("link")
-             ->id("restore")
-             ->label("Restore Original")
-             ->css_id("gKeepOriginalLink")
-             ->url(url::site("keeporiginal/restore/" . $item->id)));
-      }
-    }
-  }
-}