Merge commit 'gallery3-contrib/master'

modules/dynamic/controllers/admin_dynamic.php

@@ -0,0 +1,81 @@
+<?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 Admin_Dynamic_Controller extends Admin_Controller {
+  public function index() {
+    print $this->_get_view();
+  }
+
+  public function handler() {
+    access::verify_csrf();
+
+    $form = $this->_get_form();
+    if ($form->validate()) {
+      foreach (array("updates", "popular") as $album) {
+        $album_defn = unserialize(module::get_var("dynamic", $album));
+        $group = $form->inputs[$album];
+        $album_defn->enabled = $group->inputs["{$album}_enabled"]->value;
+        $album_defn->description = $group->inputs["{$album}_description"]->value;
+        $album_defn->limit = $group->inputs["{$album}_limit"] === "" ? null :
+          $group->inputs["{$album}_limit"]->value;
+        module::set_var("dynamic", $album, serialize($album_defn));
+      }
+
+      message::success(t("Dynamic Albums Configured"));
+
+      url::redirect("admin/dynamic");
+    }
+
+    print $this->_get_view($form);
+  }
+
+  private function _get_view($form=null) {
+    $v = new Admin_View("admin.html");
+    $v->content = new View("admin_dynamic.html");
+    $v->content->form = empty($form) ? $this->_get_form() : $form;
+    return $v;
+  }
+
+  private function _get_form() {
+
+    $form = new Forge("admin/dynamic/handler", "", "post",
+                      array("id" => "gAdminForm"));
+
+    foreach (array("updates", "popular") as $album) {
+      $album_defn = unserialize(module::get_var("dynamic", $album));
+
+      $group = $form->group($album)->label(t($album_defn->title));
+      $group->checkbox("{$album}_enabled")
+        ->label(t("Enable"))
+        ->value(1)
+        ->checked($album_defn->enabled);
+      $group->input("{$album}_limit")
+        ->label(t("Limit (leave empty for unlimited)"))
+        ->value(empty($album_defn->limit) ? "" : $album_defn->limit)
+        ->rules("valid_numeric");
+      $group->textarea("{$album}_description")
+        ->label(t("Description"))
+        ->rules("length[0,2048]")
+        ->value($album_defn->description);
+    }
+
+    $form->submit("submit")->value(t("Submit"));
+
+    return $form;
+  }
+}

modules/dynamic/controllers/dynamic.php

@@ -0,0 +1,64 @@
+<?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 Dynamic_Controller extends Controller {
+  public function updates() {
+    print $this->_show("updates");
+  }
+
+  public function popular() {
+    print $this->_show("popular");
+  }
+
+  private function _show($album) {
+    $page_size = module::get_var("gallery", "page_size", 9);
+    $page = $this->input->get("page", "1");
+
+    $album_defn = unserialize(module::get_var("dynamic", $album));
+    $children_count = $album_defn->limit;
+    if (empty($children_count)) {
+      $children_count = ORM::factory("item")
+        ->viewable()
+        ->where("type !=", "album")
+        ->count_all();
+    }
+
+    $offset = ($page-1) * $page_size;
+
+    $max_pages = ceil($children_count / $page_size);
+
+    // Make sure that the page references a valid offset
+    if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
+      Kohana::show_404();
+    }
+
+    $template = new Theme_View("page.html", "dynamic");
+    $template->set_global("page_size", $page_size);
+    $template->set_global("children", ORM::factory("item")
+                          ->viewable()
+                          ->where("type !=", "album")
+                          ->orderby($album_defn->key_field, "DESC")
+                          ->find_all($page_size, $offset));
+    $template->set_global("children_count", $children_count);
+    $template->content = new View("dynamic.html");
+    $template->content->title = t($album_defn->title);
+
+    print $template;
+  }
+
+}

modules/dynamic/helpers/dynamic_installer.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-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 dynamic_installer {
+  static function install() {
+    $version = module::get_version("dynamic");
+    if ($version == 0) {
+      module::set_var("dynamic", "popular",
+                      serialize((object)array("enabled" => false,
+                                              "limit" => null,
+                                              "description" => "",
+                                              "key_field" => "view_count",
+                                              "title" => t("Most Viewed"))));
+      module::set_var("dynamic", "updates",
+                      serialize((object)array("enabled" => false,
+                                              "limit" => null,
+                                              "description" => "",
+                                              "key_field" => "created",
+                                              "title" => t("Recent Changes"))));
+      module::set_version("dynamic", 1);
+    }
+  }
+
+  static function upgrade($version) {
+  }
+
+  static function uninstall() {
+    /* @todo Put database table drops here */
+    module::delete("dynamic");
+  }
+}

modules/dynamic/helpers/dynamic_menu.php

@@ -0,0 +1,27 @@
+<?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 dynamic_menu {
+  static function admin($menu, $theme) {
+    $menu->get("content_menu")
+      ->append(Menu::factory("link")
+        ->id("dynamic_menu")
+        ->label(t("Dynamic Albums"))
+        ->url(url::site("admin/dynamic")));
+  }
+}

modules/dynamic/helpers/dynamic_theme.php

@@ -0,0 +1,39 @@
+<?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 dynamic_theme {
+  static function sidebar_blocks($theme) {
+    $albums = array();
+    foreach (array("updates", "popular") as $album) {
+      $album_defn = unserialize(module::get_var("dynamic", $album));
+      if ($album_defn->enabled) {
+        $albums[$album] = $album_defn->title;
+      }
+    }
+    if (!empty($albums)) {
+      $block = new Block();
+      $block->css_id = "gDynamic";
+      $block->title = t("Dynamic Albums");
+      $block->content = new View("dynamic_block.html");
+      $block->content->albums = $albums;
+      return $block;
+    }
+    return "";
+  }
+
+}

modules/dynamic/module.info

@@ -0,0 +1,3 @@
+name = Dynamic
+description = Adds the Recent Changes and Most Viewed dynamic albums
+version = 1

modules/dynamic/views/admin_dynamic.html.php

@@ -0,0 +1,5 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="gAdminDynamic">
+  <h2> <?= t("Dynamic Albums") ?>  </h2>
+  <?= $form ?>
+</div>

modules/dynamic/views/dynamic_block.html.php

@@ -0,0 +1,10 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="gDynamicBlock">
+  <ul>
+  <? foreach ($albums as $album => $text): ?>
+  <li>
+  <a href="<?= url::site("dynamic/$album") ?>"><?= t($text) ?></a>
+  </li>
+  <? endforeach ?>
+  </ul>
+</div>

modules/google_analytics/controllers/admin_google_analytics.php

@@ -0,0 +1,53 @@
+<?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 Admin_Google_Analytics_Controller extends Admin_Controller {
+  public function index() {
+    print $this->_get_view();
+  }
+
+  public function handler() {
+    access::verify_csrf();
+
+    $form = $this->_get_form();
+    if ($form->validate()) {
+      module::set_var(
+        "google_analytics", "code", $form->google_analytics_code->analytics_code->value);
+      url::redirect("admin/google_analytics");
+    }
+
+    print $this->_get_view($form);
+  }
+
+  private function _get_view($form=null) {
+    $v = new Admin_View("admin.html");
+    $v->content = new View("admin_google_analytics.html");
+    $v->content->form = empty($form) ? $this->_get_form() : $form;
+    return $v;
+  }
+
+  private function _get_form() {
+    $form = new Forge("admin/google_analytics/handler", "", "post", array("id" => "gAdminForm"));
+    $group = $form->group("google_analytics_code");
+    $group->input("analytics_code")->label(t('Enter the <a href="http://www.google.com/support/googleanalytics/bin/answer.py?answer=113500" target="_blank">Web-Property-ID</a> given by Google.'))->rules("required")->value(module::get_var("google_analytics", "code"));
+    $group->submit("submit")->value(t("Save"));
+
+    return $form;
+  }
+}

modules/google_analytics/helpers/google_analytics_installer.php

@@ -0,0 +1,29 @@
+<?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 google_analytics_installer {
+  static function install() {
+    module::set_var("google_analytics", "code", "");
+    module::set_version("google_analytics", 2);
+  }
+
+  static function uninstall() {
+    module::clear_var("google_analytics", "code");
+  }
+}

modules/google_analytics/helpers/google_analytics_menu.php

@@ -0,0 +1,28 @@
+<?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 google_analytics_menu {
+  static function admin($menu, $theme) {
+    $menu->get("settings_menu")
+      ->append(Menu::factory("link")
+               ->id("google_analytics_menu")
+               ->label(t("Google Analytics"))
+               ->url(url::site("admin/google_analytics")));
+  }
+}

modules/google_analytics/helpers/google_analytics_theme.php

@@ -0,0 +1,41 @@
+<?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 google_analytics_theme {
+  static function page_bottom($theme) {
+    $google_code = '
+  	<!-- Begin Google Analytics -->
+	<script type="text/javascript">
+		var gaJsHost = (("https:" == document.location.protocol) ?
+		"https://ssl." : "http://www.");
+		document.write(unescape("%3Cscript src=\'" + gaJsHost + "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
+	</script>
+	<script type="text/javascript">
+		try
+		{
+			var pageTracker = _gat._getTracker("'.module::get_var("google_analytics", "code").'");
+			pageTracker._trackPageview();
+		}
+		catch(err){}
+	</script>
+	<!-- End Google Analytics -->';
+
+    return $google_code;
+  }
+}

modules/google_analytics/module.info

@@ -0,0 +1,3 @@
+name = Google Analytics
+description = Renders the Google Analytics Code at the end of the page. Written by 'mcp'.
+version = 1.2

modules/google_analytics/views/admin_google_analytics.html.php

@@ -0,0 +1,6 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>  
+<div id="gAdminGoogleAnalytics">
+  <h2>
+    <?= t("Google Analytics Adminstration") ?>  </h2>
+  <?= $form ?>
+</div>