Merge commit 'gallery3-contrib/master'
Conflicts: modules/itemchecksum/controllers/itemchecksum.php modules/itemchecksum/module.info
This commit is contained in:
commit
221d7777cc
@ -19,9 +19,12 @@
|
|||||||
*/
|
*/
|
||||||
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)
|
// Display the number of non-album items (photos and videos)
|
||||||
// in the specified album ($album_id).
|
// 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)
|
||||||
@ -32,9 +35,12 @@ 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
|
// Locate an item with $file_name in the album $album_id
|
||||||
// and display it's md5 checksum.
|
// 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)
|
||||||
@ -42,9 +48,12 @@ 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
|
// If the KeepOriginal module is active, check for/use the
|
||||||
// original image instead of the gallery edited version.
|
// 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)) {
|
||||||
@ -61,9 +70,13 @@ 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
|
// Locate an item with $file_name in the album $album_id
|
||||||
// and display it's sha-1 checksum.
|
// 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)
|
||||||
@ -71,9 +84,12 @@ 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
|
// If the KeepOriginal module is active, check for/use the
|
||||||
// original image instead of the gallery edited version.
|
// 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)) {
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
<<<<<<< HEAD:modules/itemchecksum/module.info
|
||||||
name = "ItemChecksum"
|
name = "ItemChecksum"
|
||||||
description = "Display's a photo or video's MD5 and SHA-1 checksum."
|
description = "Display's a photo or video's MD5 and SHA-1 checksum."
|
||||||
|
=======
|
||||||
|
name = ItemChecksum
|
||||||
|
description = Display's a photo or video's MD5 and SHA-1 checksum.
|
||||||
|
>>>>>>> gallery3-contrib/master:modules/itemchecksum/module.info
|
||||||
version = 1
|
version = 1
|
||||||
|
Reference in New Issue
Block a user