From b5beb0568c5fd089c3b52ef42d819c20fe588cf0 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Thu, 18 Jun 2009 06:59:52 +0800 Subject: [PATCH 1/3] Initial Commit. Signed-off-by: Bharat Mediratta --- modules/nobots/helpers/nobots_installer.php | 27 +++++++++++++++++++++ modules/nobots/helpers/nobots_theme.php | 25 +++++++++++++++++++ modules/nobots/module.info | 3 +++ modules/nobots/views/nobots_block.html.php | 7 ++++++ 4 files changed, 62 insertions(+) create mode 100644 modules/nobots/helpers/nobots_installer.php create mode 100644 modules/nobots/helpers/nobots_theme.php create mode 100644 modules/nobots/module.info create mode 100644 modules/nobots/views/nobots_block.html.php diff --git a/modules/nobots/helpers/nobots_installer.php b/modules/nobots/helpers/nobots_installer.php new file mode 100644 index 00000000..a01d6f8f --- /dev/null +++ b/modules/nobots/helpers/nobots_installer.php @@ -0,0 +1,27 @@ + + + + + + + From 57e4d745bece7e556445ebdbd97010340d3b5052 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Sun, 21 Jun 2009 04:52:47 +0800 Subject: [PATCH 2/3] Initial Commit. Signed-off-by: Bharat Mediratta --- .../-- theme files/Install.txt | 6 ++ .../ico-view-downloadfullsize.png | Bin 0 -> 3665 bytes .../controllers/admin_downloadfullsize.php | 80 ++++++++++++++++++ .../controllers/downloadfullsize.php | 28 ++++++ .../helpers/downloadfullsize_installer.php | 32 +++++++ .../helpers/downloadfullsize_menu.php | 42 +++++++++ .../helpers/downloadfullsize_theme.php | 36 ++++++++ modules/downloadfullsize/module.info | 3 + .../views/admin_downloadfullsize.html.php | 5 ++ .../views/downloadfullsize_block.html.php | 7 ++ 10 files changed, 239 insertions(+) create mode 100644 modules/downloadfullsize/-- theme files/Install.txt create mode 100644 modules/downloadfullsize/-- theme files/ico-view-downloadfullsize.png create mode 100644 modules/downloadfullsize/controllers/admin_downloadfullsize.php create mode 100644 modules/downloadfullsize/controllers/downloadfullsize.php create mode 100644 modules/downloadfullsize/helpers/downloadfullsize_installer.php create mode 100644 modules/downloadfullsize/helpers/downloadfullsize_menu.php create mode 100644 modules/downloadfullsize/helpers/downloadfullsize_theme.php create mode 100644 modules/downloadfullsize/module.info create mode 100644 modules/downloadfullsize/views/admin_downloadfullsize.html.php create mode 100644 modules/downloadfullsize/views/downloadfullsize_block.html.php diff --git a/modules/downloadfullsize/-- theme files/Install.txt b/modules/downloadfullsize/-- theme files/Install.txt new file mode 100644 index 00000000..b0b6ab7c --- /dev/null +++ b/modules/downloadfullsize/-- theme files/Install.txt @@ -0,0 +1,6 @@ +Copy "ico-view-downloadfullsize.png" into your "themes/CURRENTTHEME/images" folder. + +Edit the file "themes/CURRENTTHEME/css/screen.css" to include the following lines: +#gViewMenu #gDownloadFullsizeLink { + background-image: url('../images/ico-view-downloadfullsize.png'); +} diff --git a/modules/downloadfullsize/-- theme files/ico-view-downloadfullsize.png b/modules/downloadfullsize/-- theme files/ico-view-downloadfullsize.png new file mode 100644 index 0000000000000000000000000000000000000000..98b9f2b121c56117d2c6f713b461f174e29f368f GIT binary patch literal 3665 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 literal 0 HcmV?d00001 diff --git a/modules/downloadfullsize/controllers/admin_downloadfullsize.php b/modules/downloadfullsize/controllers/admin_downloadfullsize.php new file mode 100644 index 00000000..563fc7fc --- /dev/null +++ b/modules/downloadfullsize/controllers/admin_downloadfullsize.php @@ -0,0 +1,80 @@ +content = new View("admin_downloadfullsize.html"); + $view->content->downloadlinks_form = $this->_get_admin_form(); + print $view; + } + + public function saveprefs() { + // This probably does something important. + access::verify_csrf(); + + // Figure out which boxes where checked + $dlLinks_array = $_POST['DownloadLinkOptions']; + $tButton = false; + $fButton = false; + for ($i=0; $icontent = new View("admin_downloadfullsize.html"); + $view->content->downloadlinks_form = $this->_get_admin_form(); + print $view; + + } + + private function _get_admin_form() { + // Make a new Form. + $form = new Forge("admin/downloadfullsize/saveprefs", "", "post", + array("id" => "gDownloadFullsizeAdminForm")); + + // Make an array for the different types of download links. + $linkOptions["fButton"] = array("Show Floppy Disk Link", module::get_var("downloadfullsize", "fButton")); + $linkOptions["tButton"] = array("Show Text Download Text Link", module::get_var("downloadfullsize", "tButton")); + + // Setup a few checkboxes on the form. + $add_links = $form->group("DownloadLinks"); + $add_links->checklist("DownloadLinkOptions") + ->options($linkOptions); + + // Add a save button to the form. + $add_links->submit("SaveLinks")->value(t("Save")); + + // Return the newly generated form. + return $form; + } +} \ No newline at end of file diff --git a/modules/downloadfullsize/controllers/downloadfullsize.php b/modules/downloadfullsize/controllers/downloadfullsize.php new file mode 100644 index 00000000..bd7991fa --- /dev/null +++ b/modules/downloadfullsize/controllers/downloadfullsize.php @@ -0,0 +1,28 @@ +file_path()); + return ; + } +} diff --git a/modules/downloadfullsize/helpers/downloadfullsize_installer.php b/modules/downloadfullsize/helpers/downloadfullsize_installer.php new file mode 100644 index 00000000..47b7916a --- /dev/null +++ b/modules/downloadfullsize/helpers/downloadfullsize_installer.php @@ -0,0 +1,32 @@ +item)) { + if (module::get_var("downloadfullsize", "fButton")) { + $downloadLink = url::site("downloadfullsize/send/$theme->item"); + $menu + ->append(Menu::factory("link") + ->id("downloadfullsize") + ->label(t("Download Fullsize Image")) + ->url($downloadLink) + ->css_id("gDownloadFullsizeLink")); + } + } + } + static function admin($menu, $theme) { + $menu->get("settings_menu") + ->append(Menu::factory("link") + ->id("downloadfullsize") + ->label(t("Download Photo Links")) + ->url(url::site("admin/downloadfullsize"))); + } + +} diff --git a/modules/downloadfullsize/helpers/downloadfullsize_theme.php b/modules/downloadfullsize/helpers/downloadfullsize_theme.php new file mode 100644 index 00000000..450a57d0 --- /dev/null +++ b/modules/downloadfullsize/helpers/downloadfullsize_theme.php @@ -0,0 +1,36 @@ +item()->is_photo()) { + if (access::can("view_full", $theme->item)) { + if (module::get_var("downloadfullsize", "tButton")) { + $block = new Block(); + $block->css_id = "gDownloadFullsize"; + $block->title = t("Download"); + $block->content = new View("downloadfullsize_block.html"); + + $block->content->item = ORM::factory("item", 1); + + return $block; + } + } + } + } +} diff --git a/modules/downloadfullsize/module.info b/modules/downloadfullsize/module.info new file mode 100644 index 00000000..3f31f39a --- /dev/null +++ b/modules/downloadfullsize/module.info @@ -0,0 +1,3 @@ +name = DownloadFullsize +description = Displays a link to download the fullsize version of the current photo. +version = 1 diff --git a/modules/downloadfullsize/views/admin_downloadfullsize.html.php b/modules/downloadfullsize/views/admin_downloadfullsize.html.php new file mode 100644 index 00000000..d978054d --- /dev/null +++ b/modules/downloadfullsize/views/admin_downloadfullsize.html.php @@ -0,0 +1,5 @@ + +
+

+ +
diff --git a/modules/downloadfullsize/views/downloadfullsize_block.html.php b/modules/downloadfullsize/views/downloadfullsize_block.html.php new file mode 100644 index 00000000..9ce631eb --- /dev/null +++ b/modules/downloadfullsize/views/downloadfullsize_block.html.php @@ -0,0 +1,7 @@ + + +
+item") + ?>" title="" + class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> +
From bcf7aee864e021038bf9441d0fd7eb7d666f1dcb Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 20 Jun 2009 16:29:01 -0700 Subject: [PATCH 3/3] Minor clean up. * Change $_POST to Input::instance()->post * Explain what access::verify_csrf() does * Avoid breakages on tag album pages (which don't have an item) * Minor style fixes. There's more that could be done here, but this is sufficient. --- .../controllers/admin_downloadfullsize.php | 6 ++--- .../controllers/downloadfullsize.php | 3 +-- .../helpers/downloadfullsize_installer.php | 2 -- .../helpers/downloadfullsize_menu.php | 1 + .../helpers/downloadfullsize_theme.php | 24 +++++++++---------- .../views/downloadfullsize_block.html.php | 4 ++-- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/modules/downloadfullsize/controllers/admin_downloadfullsize.php b/modules/downloadfullsize/controllers/admin_downloadfullsize.php index 563fc7fc..1a0e9a23 100644 --- a/modules/downloadfullsize/controllers/admin_downloadfullsize.php +++ b/modules/downloadfullsize/controllers/admin_downloadfullsize.php @@ -28,14 +28,14 @@ class Admin_DownloadFullsize_Controller extends Admin_Controller { } public function saveprefs() { - // This probably does something important. + // Prevent Cross Site Request Forgery access::verify_csrf(); // Figure out which boxes where checked - $dlLinks_array = $_POST['DownloadLinkOptions']; + $dlLinks_array = Input::instance()->post("DownloadLinkOptions"); $tButton = false; $fButton = false; - for ($i=0; $ifile_path()); - return ; } } diff --git a/modules/downloadfullsize/helpers/downloadfullsize_installer.php b/modules/downloadfullsize/helpers/downloadfullsize_installer.php index 47b7916a..fe5d74b9 100644 --- a/modules/downloadfullsize/helpers/downloadfullsize_installer.php +++ b/modules/downloadfullsize/helpers/downloadfullsize_installer.php @@ -20,13 +20,11 @@ class downloadfullsize_installer { static function install() { $version = module::get_version("downloadfullsize"); if ($version == 0) { - /* @todo Put database creation here */ module::set_version("downloadfullsize", 1); } } static function uninstall() { - /* @todo Put database table drops here */ module::delete("downloadfullsize"); } } diff --git a/modules/downloadfullsize/helpers/downloadfullsize_menu.php b/modules/downloadfullsize/helpers/downloadfullsize_menu.php index 4fd374dc..d7095cc5 100644 --- a/modules/downloadfullsize/helpers/downloadfullsize_menu.php +++ b/modules/downloadfullsize/helpers/downloadfullsize_menu.php @@ -31,6 +31,7 @@ class downloadfullsize_menu_Core { } } } + static function admin($menu, $theme) { $menu->get("settings_menu") ->append(Menu::factory("link") diff --git a/modules/downloadfullsize/helpers/downloadfullsize_theme.php b/modules/downloadfullsize/helpers/downloadfullsize_theme.php index 450a57d0..70e4bb00 100644 --- a/modules/downloadfullsize/helpers/downloadfullsize_theme.php +++ b/modules/downloadfullsize/helpers/downloadfullsize_theme.php @@ -1,4 +1,5 @@ -item()->is_photo()) { - if (access::can("view_full", $theme->item)) { - if (module::get_var("downloadfullsize", "tButton")) { - $block = new Block(); - $block->css_id = "gDownloadFullsize"; - $block->title = t("Download"); - $block->content = new View("downloadfullsize_block.html"); + $item = $theme->item(); + if ($item && $item->is_photo() && access::can("view_full", $item)) { + if (module::get_var("downloadfullsize", "tButton")) { + $block = new Block(); + $block->css_id = "gDownloadFullsize"; + $block->title = t("Download"); + $block->content = new View("downloadfullsize_block.html"); - $block->content->item = ORM::factory("item", 1); + $block->content->item = ORM::factory("item", 1); - return $block; - } + return $block; } } - } + } } diff --git a/modules/downloadfullsize/views/downloadfullsize_block.html.php b/modules/downloadfullsize/views/downloadfullsize_block.html.php index 9ce631eb..342cf336 100644 --- a/modules/downloadfullsize/views/downloadfullsize_block.html.php +++ b/modules/downloadfullsize/views/downloadfullsize_block.html.php @@ -1,7 +1,7 @@
-item") - ?>" title="" +item") ?>" + title="" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">