public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge Fix.

Browse Source
This commit is contained in:
rWatcher 2009-06-21 00:03:54 -04:00
parent a74d58d6db
commit 5cc0a4962d
6 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/downloadfullsize/controllers/admin_downloadfullsize.php
View File

@ -28,16 +28,6 @@ class Admin_DownloadFullsize_Controller extends Admin_Controller {
}
public function saveprefs() {
<<<<<<< HEAD:modules/downloadfullsize/controllers/admin_downloadfullsize.php
// 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; $i<count($dlLinks_array); $i++) {
=======
// Prevent Cross Site Request Forgery
access::verify_csrf();
@ -46,7 +36,6 @@ class Admin_DownloadFullsize_Controller extends Admin_Controller {
$tButton = false;
$fButton = false;
for ($i = 0; $i < count($dlLinks_array); $i++) {
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/controllers/admin_downloadfullsize.php
if ($dlLinks_array[$i] == "tButton") {
$tButton = true;
}

8
modules/downloadfullsize/controllers/downloadfullsize.php
View File

@ -18,18 +18,10 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class downloadfullsize_Controller extends Controller {
<<<<<<< HEAD:modules/downloadfullsize/controllers/downloadfullsize.php
=======
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/controllers/downloadfullsize.php
public function send($id) {
$item = ORM::factory("item", $id);
access::required("view_full", $item);
download::force($item->file_path());
<<<<<<< HEAD:modules/downloadfullsize/controllers/downloadfullsize.php
return ;
=======
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/controllers/downloadfullsize.php
}
}

8
modules/downloadfullsize/helpers/downloadfullsize_installer.php
View File

@ -20,19 +20,11 @@ class downloadfullsize_installer {
static function install() {
$version = module::get_version("downloadfullsize");
if ($version == 0) {
<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_installer.php
/* @todo Put database creation here */
=======
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_installer.php
module::set_version("downloadfullsize", 1);
}
}
static function uninstall() {
<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_installer.php
/* @todo Put database table drops here */
=======
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_installer.php
module::delete("downloadfullsize");
}
}

3
modules/downloadfullsize/helpers/downloadfullsize_menu.php
View File

@ -31,10 +31,7 @@ class downloadfullsize_menu_Core {
}
}
}
<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_menu.php
=======
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_menu.php
static function admin($menu, $theme) {
$menu->get("settings_menu")
->append(Menu::factory("link")

22
modules/downloadfullsize/helpers/downloadfullsize_theme.php
View File

@ -1,9 +1,5 @@
<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_theme.php
<?php defined("SYSPATH") or die("No direct script access.");/**
=======
<?php defined("SYSPATH") or die("No direct script access.");
/**
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_theme.php
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
@ -23,23 +19,6 @@
*/
class downloadfullsize_theme {
static function sidebar_blocks($theme) {
<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_theme.php
if ($theme->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;
}
}
}
}
=======
$item = $theme->item();
if ($item && $item->is_photo() && access::can("view_full", $item)) {
if (module::get_var("downloadfullsize", "tButton")) {
@ -54,5 +33,4 @@ class downloadfullsize_theme {
}
}
}
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_theme.php
}

5
modules/downloadfullsize/views/downloadfullsize_block.html.php
View File

@ -1,12 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div class="gDownloadFullsizeBlock">
<<<<<<< HEAD:modules/downloadfullsize/views/downloadfullsize_block.html.php
<a href="<?= url::site("downloadfullsize/send/$theme->item")
?>" title="<?= t("Download Photo") ?>"
=======
<a href="<?= url::site("downloadfullsize/send/$theme->item") ?>"
title="<?= t("Download Photo") ?>"
>>>>>>> gallery3-contrib/master:modules/downloadfullsize/views/downloadfullsize_block.html.php
class="gButtonLink ui-icon-left ui-state-default ui-corner-all"><?= t("Download Fullsize Image") ?></a>
</div>