From 3d1ea2904d982422ce24c43b25d0d4bca6f29aa3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 18 Jan 2009 05:01:00 +0000
Subject: Rename theme callback helpers from xxx_block to xxx_theme to make
 room for us to rename the dashboard helper to be a block helper since sidebar
 blocks are not just in the dashboard.

---
 modules/comment/helpers/comment_block.php       | 42 ---------------------
 modules/comment/helpers/comment_theme.php       | 42 +++++++++++++++++++++
 modules/gmaps/helpers/gmaps_block.php           | 31 ---------------
 modules/gmaps/helpers/gmaps_theme.php           | 30 +++++++++++++++
 modules/info/helpers/info_block.php             | 45 ----------------------
 modules/info/helpers/info_theme.php             | 45 ++++++++++++++++++++++
 modules/media_rss/helpers/media_rss_block.php   | 32 ----------------
 modules/media_rss/helpers/media_rss_theme.php   | 32 ++++++++++++++++
 modules/polar_rose/helpers/polar_rose_block.php | 50 -------------------------
 modules/polar_rose/helpers/polar_rose_theme.php | 50 +++++++++++++++++++++++++
 modules/rearrange/helpers/rearrange_block.php   | 30 ---------------
 modules/rearrange/helpers/rearrange_theme.php   | 30 +++++++++++++++
 modules/search/helpers/search_block.php         | 25 -------------
 modules/search/helpers/search_theme.php         | 25 +++++++++++++
 modules/slideshow/helpers/slideshow_block.php   | 25 -------------
 modules/slideshow/helpers/slideshow_theme.php   | 25 +++++++++++++
 modules/tag/helpers/tag_block.php               | 46 -----------------------
 modules/tag/helpers/tag_theme.php               | 46 +++++++++++++++++++++++
 modules/user/helpers/user_block.php             | 35 -----------------
 modules/user/helpers/user_theme.php             | 35 +++++++++++++++++
 20 files changed, 360 insertions(+), 361 deletions(-)
 delete mode 100644 modules/comment/helpers/comment_block.php
 create mode 100644 modules/comment/helpers/comment_theme.php
 delete mode 100644 modules/gmaps/helpers/gmaps_block.php
 create mode 100644 modules/gmaps/helpers/gmaps_theme.php
 delete mode 100644 modules/info/helpers/info_block.php
 create mode 100644 modules/info/helpers/info_theme.php
 delete mode 100644 modules/media_rss/helpers/media_rss_block.php
 create mode 100644 modules/media_rss/helpers/media_rss_theme.php
 delete mode 100644 modules/polar_rose/helpers/polar_rose_block.php
 create mode 100644 modules/polar_rose/helpers/polar_rose_theme.php
 delete mode 100644 modules/rearrange/helpers/rearrange_block.php
 create mode 100644 modules/rearrange/helpers/rearrange_theme.php
 delete mode 100644 modules/search/helpers/search_block.php
 create mode 100644 modules/search/helpers/search_theme.php
 delete mode 100644 modules/slideshow/helpers/slideshow_block.php
 create mode 100644 modules/slideshow/helpers/slideshow_theme.php
 delete mode 100644 modules/tag/helpers/tag_block.php
 create mode 100644 modules/tag/helpers/tag_theme.php
 delete mode 100644 modules/user/helpers/user_block.php
 create mode 100644 modules/user/helpers/user_theme.php

(limited to 'modules')

diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
deleted file mode 100644
index d8f08feb..00000000
--- a/modules/comment/helpers/comment_block.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 comment_block_Core {
-  static function head($theme) {
-    $url = url::file("modules/comment/js/comment.js");
-    return "<script src=\"$url\" type=\"text/javascript\"></script>\n";
-  }
-
-  static function photo_bottom($theme) {
-    $block = new Block;
-    $block->css_id = "gComments";
-    $block->title = t("Comments");
-
-    $view = new View("comments.html");
-    $view->comments = ORM::factory("comment")
-      ->where("item_id", $theme->item()->id)
-      ->where("state", "published")
-      ->orderby("created", "ASC")
-      ->find_all();
-
-    $block->content = $view;
-    $block->content .= comment::get_add_form($theme->item())->render("form.html");
-    return $block;
-  }
-}
\ No newline at end of file
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
new file mode 100644
index 00000000..3861bae0
--- /dev/null
+++ b/modules/comment/helpers/comment_theme.php
@@ -0,0 +1,42 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 comment_theme_Core {
+  static function head($theme) {
+    $url = url::file("modules/comment/js/comment.js");
+    return "<script src=\"$url\" type=\"text/javascript\"></script>\n";
+  }
+
+  static function photo_bottom($theme) {
+    $block = new Block;
+    $block->css_id = "gComments";
+    $block->title = t("Comments");
+
+    $view = new View("comments.html");
+    $view->comments = ORM::factory("comment")
+      ->where("item_id", $theme->item()->id)
+      ->where("state", "published")
+      ->orderby("created", "ASC")
+      ->find_all();
+
+    $block->content = $view;
+    $block->content .= comment::get_add_form($theme->item())->render("form.html");
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/gmaps/helpers/gmaps_block.php b/modules/gmaps/helpers/gmaps_block.php
deleted file mode 100644
index 06894005..00000000
--- a/modules/gmaps/helpers/gmaps_block.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 gmaps_block_Core {
-  static function sidebar_blocks($theme) {
-    if ($theme->item()) {
-      $block = new Block();
-      $block->css_id = "gMaps";
-      $block->title = t("Location");
-      $block->content = new View("gmaps_block.html");
-      return $block;
-    }
-  }
-}
\ No newline at end of file
diff --git a/modules/gmaps/helpers/gmaps_theme.php b/modules/gmaps/helpers/gmaps_theme.php
new file mode 100644
index 00000000..582eccfe
--- /dev/null
+++ b/modules/gmaps/helpers/gmaps_theme.php
@@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 gmaps_theme_Core {
+  static function sidebar_blocks($theme) {
+    if ($theme->item()) {
+      $block = new Block();
+      $block->css_id = "gMaps";
+      $block->title = t("Location");
+      $block->content = new View("gmaps_block.html");
+      return $block;
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
deleted file mode 100644
index c832b4f6..00000000
--- a/modules/info/helpers/info_block.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 info_block_Core {
-  static function sidebar_blocks($theme) {
-    if ($theme->item()) {
-      $block = new Block();
-      $block->css_id = "gMetadata";
-      $block->title = t("Item Info");
-      $block->content = new View("info_block.html");
-      return $block;
-    }
-  }
-
-  static function thumb_info($theme, $item) {
-    $results = "";
-    if ($item->view_count) {
-      $results .= "<li>";
-      $results .= t("Views: %view_count", array("view_count" => $item->view_count));
-      $results .= "</li>";
-    }
-    if ($item->owner) {
-      $results .= "<li>";
-      $results .= t("By: %owner_name", array("owner_name" => "<a href=\"#\">{$item->owner->name}</a>"));
-      $results .= "</li>";
-    }
-    return $results;
-  }
-}
\ No newline at end of file
diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
new file mode 100644
index 00000000..3b90c640
--- /dev/null
+++ b/modules/info/helpers/info_theme.php
@@ -0,0 +1,45 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 info_theme_Core {
+  static function sidebar_blocks($theme) {
+    if ($theme->item()) {
+      $block = new Block();
+      $block->css_id = "gMetadata";
+      $block->title = t("Item Info");
+      $block->content = new View("info_block.html");
+      return $block;
+    }
+  }
+
+  static function thumb_info($theme, $item) {
+    $results = "";
+    if ($item->view_count) {
+      $results .= "<li>";
+      $results .= t("Views: %view_count", array("view_count" => $item->view_count));
+      $results .= "</li>";
+    }
+    if ($item->owner) {
+      $results .= "<li>";
+      $results .= t("By: %owner_name", array("owner_name" => "<a href=\"#\">{$item->owner->name}</a>"));
+      $results .= "</li>";
+    }
+    return $results;
+  }
+}
\ No newline at end of file
diff --git a/modules/media_rss/helpers/media_rss_block.php b/modules/media_rss/helpers/media_rss_block.php
deleted file mode 100644
index 80fb009e..00000000
--- a/modules/media_rss/helpers/media_rss_block.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 media_rss_block_Core {
-  static function head($theme) {
-    if ($theme->item()) {
-      $url = media_rss::item_feed($theme->item());
-    } else if ($theme->tag()) {
-      $url = media_rss::tag_feed($theme->tag());
-    }
-
-    if (!empty($url)) {
-      return "<link rel=\"alternate\" type=\"" . rest::RSS . "\" href=\"$url\" />";
-    }
-  }
-}
diff --git a/modules/media_rss/helpers/media_rss_theme.php b/modules/media_rss/helpers/media_rss_theme.php
new file mode 100644
index 00000000..84788e61
--- /dev/null
+++ b/modules/media_rss/helpers/media_rss_theme.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 media_rss_theme_Core {
+  static function head($theme) {
+    if ($theme->item()) {
+      $url = media_rss::item_feed($theme->item());
+    } else if ($theme->tag()) {
+      $url = media_rss::tag_feed($theme->tag());
+    }
+
+    if (!empty($url)) {
+      return "<link rel=\"alternate\" type=\"" . rest::RSS . "\" href=\"$url\" />";
+    }
+  }
+}
diff --git a/modules/polar_rose/helpers/polar_rose_block.php b/modules/polar_rose/helpers/polar_rose_block.php
deleted file mode 100644
index 85486917..00000000
--- a/modules/polar_rose/helpers/polar_rose_block.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 polar_rose_block_Core {
-  static function head($theme) {
-    if (module::is_installed("media_rss")) {
-      if ($theme->item()) {
-        $url = media_rss::item_feed($theme->item());
-      } else if ($theme->tag()) {
-        $url = media_rss::tag_feed($theme->tag());
-      }
-
-      // Polar Rose doesn't understand relative URLs.  Hack around that until they fix it.
-      $url = url::abs_site(substr($url, strpos($url, "index.php") + 10));
-
-      return "<script type=\"text/javascript\">" .
-        "var polarroseconfig = {" .
-        "partner: 'gallery3'," .
-        "rss: '$url'," .
-        "insert: 'gPolarRose'," .
-        "optin: ''," .
-        "theme: 'dark'" .
-        "}</script>" .
-        "<script type=\"text/javascript\" " .
-        "src=\"http://cdn.widget.polarrose.com/widgetanddashboard/" .
-        "polarrosewidgetanddashboard.js\">" .
-        "</script>";
-    }
-  }
-
-  static function page_bottom($theme) {
-    return "<div id=\"gPolarRose\"></div>";
-  }
-}
diff --git a/modules/polar_rose/helpers/polar_rose_theme.php b/modules/polar_rose/helpers/polar_rose_theme.php
new file mode 100644
index 00000000..aefc6713
--- /dev/null
+++ b/modules/polar_rose/helpers/polar_rose_theme.php
@@ -0,0 +1,50 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 polar_rose_theme_Core {
+  static function head($theme) {
+    if (module::is_installed("media_rss")) {
+      if ($theme->item()) {
+        $url = media_rss::item_feed($theme->item());
+      } else if ($theme->tag()) {
+        $url = media_rss::tag_feed($theme->tag());
+      }
+
+      // Polar Rose doesn't understand relative URLs.  Hack around that until they fix it.
+      $url = url::abs_site(substr($url, strpos($url, "index.php") + 10));
+
+      return "<script type=\"text/javascript\">" .
+        "var polarroseconfig = {" .
+        "partner: 'gallery3'," .
+        "rss: '$url'," .
+        "insert: 'gPolarRose'," .
+        "optin: ''," .
+        "theme: 'dark'" .
+        "}</script>" .
+        "<script type=\"text/javascript\" " .
+        "src=\"http://cdn.widget.polarrose.com/widgetanddashboard/" .
+        "polarrosewidgetanddashboard.js\">" .
+        "</script>";
+    }
+  }
+
+  static function page_bottom($theme) {
+    return "<div id=\"gPolarRose\"></div>";
+  }
+}
diff --git a/modules/rearrange/helpers/rearrange_block.php b/modules/rearrange/helpers/rearrange_block.php
deleted file mode 100644
index 999be91e..00000000
--- a/modules/rearrange/helpers/rearrange_block.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 rearrange_block_Core {
-  static function head($theme) {
-    $head[] = html::script("modules/rearrange/js/jquery.gallery.rearrange.tree.js");
-
-    $url = url::file("modules/rearrange/css/rearrange.css");
-    $head[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" " .
-      "media=\"screen,print,projection\" />";
-
-    return implode("\n", $head);
-  }
-}
diff --git a/modules/rearrange/helpers/rearrange_theme.php b/modules/rearrange/helpers/rearrange_theme.php
new file mode 100644
index 00000000..832e7200
--- /dev/null
+++ b/modules/rearrange/helpers/rearrange_theme.php
@@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 rearrange_theme_Core {
+  static function head($theme) {
+    $head[] = html::script("modules/rearrange/js/jquery.gallery.rearrange.tree.js");
+
+    $url = url::file("modules/rearrange/css/rearrange.css");
+    $head[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" " .
+      "media=\"screen,print,projection\" />";
+
+    return implode("\n", $head);
+  }
+}
diff --git a/modules/search/helpers/search_block.php b/modules/search/helpers/search_block.php
deleted file mode 100644
index e390b9fc..00000000
--- a/modules/search/helpers/search_block.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 search_block_Core {
-  static function header_top($theme) {
-    $view = new View("search_link.html");
-    return $view->render();
-  }
-}
\ No newline at end of file
diff --git a/modules/search/helpers/search_theme.php b/modules/search/helpers/search_theme.php
new file mode 100644
index 00000000..63cc41c4
--- /dev/null
+++ b/modules/search/helpers/search_theme.php
@@ -0,0 +1,25 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 search_theme_Core {
+  static function header_top($theme) {
+    $view = new View("search_link.html");
+    return $view->render();
+  }
+}
\ No newline at end of file
diff --git a/modules/slideshow/helpers/slideshow_block.php b/modules/slideshow/helpers/slideshow_block.php
deleted file mode 100644
index 6a5a3f95..00000000
--- a/modules/slideshow/helpers/slideshow_block.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 slideshow_block_Core {
-  static function head($theme) {
-    return "<script src=\"http://lite.piclens.com/current/piclens.js\" type=\"text/javascript\">" .
-      "</script>";
-  }
-}
diff --git a/modules/slideshow/helpers/slideshow_theme.php b/modules/slideshow/helpers/slideshow_theme.php
new file mode 100644
index 00000000..56349dda
--- /dev/null
+++ b/modules/slideshow/helpers/slideshow_theme.php
@@ -0,0 +1,25 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 slideshow_theme_Core {
+  static function head($theme) {
+    return "<script src=\"http://lite.piclens.com/current/piclens.js\" type=\"text/javascript\">" .
+      "</script>";
+  }
+}
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
deleted file mode 100644
index 8436dd08..00000000
--- a/modules/tag/helpers/tag_block.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 tag_block_Core {
-  static function head($theme) {
-    $url = url::file("modules/tag/js/tag.js");
-    return "<script src=\"$url\" type=\"text/javascript\"></script>";
-  }
-
-  static function sidebar_blocks($theme) {
-    $block = new Block();
-    $block->css_id = "gTag";
-    $block->title = t("Popular Tags");
-    $block->content = new View("tag_block.html");
-    $block->content->cloud = tag::cloud(30);
-
-    if ($theme->page_type() != "tag" && access::can("edit", $theme->item())) {
-      $controller = new Tags_Controller();
-      $block->content->form = tag::get_add_form($theme->item());
-    } else {
-      $block->content->form = "";
-    }
-
-    return $block;
-  }
-
-  static function sort_by_name($tag1, $tag2) {
-    return strcasecmp($tag1->name, $tag2->name);
-  }
-}
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
new file mode 100644
index 00000000..7a014d24
--- /dev/null
+++ b/modules/tag/helpers/tag_theme.php
@@ -0,0 +1,46 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 tag_theme_Core {
+  static function head($theme) {
+    $url = url::file("modules/tag/js/tag.js");
+    return "<script src=\"$url\" type=\"text/javascript\"></script>";
+  }
+
+  static function sidebar_blocks($theme) {
+    $block = new Block();
+    $block->css_id = "gTag";
+    $block->title = t("Popular Tags");
+    $block->content = new View("tag_block.html");
+    $block->content->cloud = tag::cloud(30);
+
+    if ($theme->page_type() != "tag" && access::can("edit", $theme->item())) {
+      $controller = new Tags_Controller();
+      $block->content->form = tag::get_add_form($theme->item());
+    } else {
+      $block->content->form = "";
+    }
+
+    return $block;
+  }
+
+  static function sort_by_name($tag1, $tag2) {
+    return strcasecmp($tag1->name, $tag2->name);
+  }
+}
\ No newline at end of file
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
deleted file mode 100644
index bb9e567f..00000000
--- a/modules/user/helpers/user_block.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 user_block_Core {
-  static function head($theme) {
-    // @todo: move this into the theme
-    $user = user::active();
-    if (!user::active()->guest) {
-      $url = url::file("lib/jquery.jeditable.js");
-      return "<script src=\"$url\" type=\"text/javascript\"></script>";
-    }
-  }
-
-  static function header_top($theme) {
-    $view = new View("login.html");
-    $view->user = user::active();
-    return $view->render();
-  }
-}
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
new file mode 100644
index 00000000..68424708
--- /dev/null
+++ b/modules/user/helpers/user_theme.php
@@ -0,0 +1,35 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 user_theme_Core {
+  static function head($theme) {
+    // @todo: move this into the theme
+    $user = user::active();
+    if (!user::active()->guest) {
+      $url = url::file("lib/jquery.jeditable.js");
+      return "<script src=\"$url\" type=\"text/javascript\"></script>";
+    }
+  }
+
+  static function header_top($theme) {
+    $view = new View("login.html");
+    $view->user = user::active();
+    return $view->render();
+  }
+}
-- 
cgit v1.2.3