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

Git Weirdness Fix.

Browse Source
This commit is contained in:
rWatcher 2009-08-31 00:55:21 -04:00
parent 8710f1ee50
commit edaa788b1c
1 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/itemchecksum/controllers/itemchecksum.php
View File

@ -19,12 +19,6 @@
*/ */
class itemchecksum_Controller extends Controller { class itemchecksum_Controller extends Controller {
public function albumcount($album_id) { public function albumcount($album_id) {
<<<<<<< HEAD:modules/itemchecksum/controllers/itemchecksum.php
// Display the number of non-album items (photos and videos)
// in the specified album ($album_id).
=======
>>>>>>> gallery3-contrib/master:modules/itemchecksum/controllers/itemchecksum.php
$item = ORM::factory("item") $item = ORM::factory("item")
->viewable() ->viewable()
->where("parent_id", $album_id) ->where("parent_id", $album_id)
@ -35,12 +29,6 @@ class itemchecksum_Controller extends Controller {
} }
public function md5($album_id, $file_name) { public function md5($album_id, $file_name) {
<<<<<<< HEAD:modules/itemchecksum/controllers/itemchecksum.php
// Locate an item with $file_name in the album $album_id
// and display it's md5 checksum.
=======
>>>>>>> gallery3-contrib/master:modules/itemchecksum/controllers/itemchecksum.php
$item = ORM::factory("item") $item = ORM::factory("item")
->where("parent_id", $album_id) ->where("parent_id", $album_id)
->where("name", $file_name) ->where("name", $file_name)
@ -48,12 +36,6 @@ class itemchecksum_Controller extends Controller {
if (count($item) > 0) { if (count($item) > 0) {
access::required("view_full", $item[0]); access::required("view_full", $item[0]);
<<<<<<< HEAD:modules/itemchecksum/controllers/itemchecksum.php
// If the KeepOriginal module is active, check for/use the
// original image instead of the gallery edited version.
=======
>>>>>>> gallery3-contrib/master:modules/itemchecksum/controllers/itemchecksum.php
if (module::is_active("keeporiginal")) { if (module::is_active("keeporiginal")) {
$original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item[0]->file_path()); $original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item[0]->file_path());
if ($item[0]->is_photo() && file_exists($original_image)) { if ($item[0]->is_photo() && file_exists($original_image)) {
@ -70,13 +52,7 @@ class itemchecksum_Controller extends Controller {
} }
public function sha1($album_id, $file_name) { public function sha1($album_id, $file_name) {
<<<<<<< HEAD:modules/itemchecksum/controllers/itemchecksum.php
// Locate an item with $file_name in the album $album_id
// and display it's sha-1 checksum.
=======
>>>>>>> gallery3-contrib/master:modules/itemchecksum/controllers/itemchecksum.php
$item = ORM::factory("item") $item = ORM::factory("item")
->where("parent_id", $album_id) ->where("parent_id", $album_id)
->where("name", $file_name) ->where("name", $file_name)
@ -84,12 +60,6 @@ class itemchecksum_Controller extends Controller {
if (count($item) > 0) { if (count($item) > 0) {
access::required("view_full", $item[0]); access::required("view_full", $item[0]);
<<<<<<< HEAD:modules/itemchecksum/controllers/itemchecksum.php
// If the KeepOriginal module is active, check for/use the
// original image instead of the gallery edited version.
=======
>>>>>>> gallery3-contrib/master:modules/itemchecksum/controllers/itemchecksum.php
if (module::is_active("keeporiginal")) { if (module::is_active("keeporiginal")) {
$original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item[0]->file_path()); $original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item[0]->file_path());
if ($item[0]->is_photo() && file_exists($original_image)) { if ($item[0]->is_photo() && file_exists($original_image)) {