Merge branch 'master' of git://github.com/gallery/gallery3-contrib
This commit is contained in:
Chad Kieffer
commit
e1558131d2
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
24
3.0/modules/aws_s3/changelog.txt
Normal file
24
3.0/modules/aws_s3/changelog.txt
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
2011-01-20: Version 2
|
||||
|
||||
Added features
|
||||
--------------
|
||||
- upload select types of images only (thumbs/resizes/fullsizes)
|
||||
- schedule initial synchronisation during gallery shutdown to prevent browser hanging on large installations
|
||||
- schedule upload of new items after upload during gallery shutdown to prevent browser hanging on slower
|
||||
uplink connections (dsl home servers, etc)
|
||||
|
||||
Bug fixes
|
||||
---------
|
||||
- added verification routine to verify entered bucket name and access credentials to avoid false hope
|
||||
- added check in module's installed to prevent installation should curl not be installed, as the s3 library
|
||||
depends on it
|
||||
- resolved some issues with cooliris slideshow player not working correctly, due to browsers blocking ajax calls
|
||||
for images since it's cross-domain. the module will now allow the browser to pull the images from the local server
|
||||
to prevent any xdr issues
|
||||
- fixed problems moving items around. the module now moves content around the s3 bucket to coincide with the local
|
||||
filesystem and g3's perception of items and albums
|
||||
- resolved problems with odd characters in filenames. this actually wasn't to do with odd characters but to do with
|
||||
the filename being escaped twice, causing file not found errors
|
||||
|
||||
2010-11-26: Version 1
|
||||
- Initial release.
|
||||
|
|
@ -3,37 +3,90 @@
|
|||
class Admin_Aws_S3_Controller extends Admin_Controller {
|
||||
|
||||
public function index() {
|
||||
// require_once(MODPATH . "aws_s3/lib/s3.php");
|
||||
|
||||
$form = $this->_get_s3_form();
|
||||
|
||||
if (request::method() == "post") {
|
||||
access::verify_csrf();
|
||||
|
||||
if ($form->validate()) {
|
||||
module::set_var("aws_s3", "enabled", (isset($_POST['enabled']) ? true : false));
|
||||
module::set_var("aws_s3", "access_key", $_POST['access_key']);
|
||||
module::set_var("aws_s3", "secret_key", $_POST['secret_key']);
|
||||
module::set_var("aws_s3", "bucket_name", $_POST['bucket_name']);
|
||||
module::set_var("aws_s3", "g3id", $_POST['g3id']);
|
||||
if (($valid_form = $form->validate()) &&
|
||||
($s3_axs_correct = aws_s3::validate_access_details($_POST['access_key'], $_POST['secret_key'], $_POST['bucket_name']))) {
|
||||
|
||||
module::set_var("aws_s3", "url_str", $_POST['url_str']);
|
||||
module::set_var("aws_s3", "sig_exp", $_POST['sig_exp']);
|
||||
// get variable values before changes so we can act on certain changes later
|
||||
$vars = array();
|
||||
foreach (ORM::factory("var")->where("module_name", "=", "aws_s3")->find_all() as $var) {
|
||||
$vars[$var->name] = $var->value;
|
||||
}
|
||||
|
||||
// set variables from $_POST into module::set_var() to save
|
||||
module::set_var("aws_s3", "enabled", (isset($_POST['enabled']) ? true : false));
|
||||
module::set_var("aws_s3", "access_key", $_POST['access_key']);
|
||||
module::set_var("aws_s3", "secret_key", $_POST['secret_key']);
|
||||
module::set_var("aws_s3", "bucket_name", $_POST['bucket_name']);
|
||||
site_status::clear("aws_s3_not_configured");
|
||||
|
||||
module::set_var("aws_s3", "use_ssl", (isset($_POST['use_ssl']) ? true : false));
|
||||
module::set_var("aws_s3", "g3id", $_POST['g3id']);
|
||||
|
||||
if (module::get_var("aws_s3", "enabled") && !module::get_var("aws_s3", "synced", false))
|
||||
module::set_var("aws_s3", "url_str", $_POST['url_str']);
|
||||
module::set_var("aws_s3", "sig_exp", $_POST['sig_exp']);
|
||||
|
||||
module::set_var("aws_s3", "use_ssl", (isset($_POST['use_ssl']) ? true : false));
|
||||
|
||||
module::set_var("aws_s3", "upload_thumbs", (isset($_POST['upload_thumbs']) ? true : false));
|
||||
module::set_var("aws_s3", "upload_resizes", (isset($_POST['upload_resizes']) ? true : false));
|
||||
module::set_var("aws_s3", "upload_fullsizes", (isset($_POST['upload_fullsizes']) ? true : false));
|
||||
|
||||
module::set_var("aws_s3", "s3_storage_only", (isset($_POST['s3_storage_only']) ? true : false));
|
||||
|
||||
// post option processing
|
||||
// if (module::get_var("aws_s3", "s3_storage_only") && !module::get_var("aws_s3", "enabled")) {
|
||||
// module::set_var("aws_s3", "enabled", true);
|
||||
// module::set_var("aws_s3", "upload_thumbs", true);
|
||||
// module::set_var("aws_s3", "upload_resizes", true);
|
||||
// module::set_var("aws_s3", "upload_fullsizes", true);
|
||||
// }
|
||||
// if (module::get_var("aws_s3", "s3_storage_only") && !$vars['s3_storage_only']) {
|
||||
// // content needs remove from local storage as it wasn't switched on before this point.
|
||||
// if (!module::get_var("aws_s3", "synced")) {
|
||||
// // force a sync between local storage and S3, as we're about to remove content from local storage.
|
||||
// }
|
||||
// }
|
||||
// else if (!module::get_var("aws_s3", "s3_storage_only") && $vars['s3_storage_only']) {
|
||||
// // content needs to be downloaded from s3 as it was just switched off. at this point,
|
||||
// // we shouldn't actually have a copy of the gallery content locally.
|
||||
// }
|
||||
|
||||
if (module::get_var("aws_s3", "enabled") && !module::get_var("aws_s3", "synced", false)) {
|
||||
if (aws_s3::can_schedule()) {
|
||||
// i can schedule this task
|
||||
aws_s3::schedule_full_sync2();
|
||||
site_status::warning(
|
||||
t('Your site has not yet been syncronised with your Amazon S3 bucket. Content will not appear correctly until you perform syncronisation. <a href="%url" class="g-dialog-link">Fix this now</a>',
|
||||
array("url" => html::mark_clean(url::site("admin/maintenance/start/aws_s3_task::sync?csrf=__CSRF__")))
|
||||
), "aws_s3_not_synced");
|
||||
|
||||
"Your site has been scheduled for full Amazon S3 re-synchronisation. This message will clear when this has been completed.",
|
||||
"aws_s3_not_synced"
|
||||
);
|
||||
}
|
||||
else {
|
||||
// i CAN'T schedule it..
|
||||
site_status::warning(
|
||||
t('Your site has not been synchronised to Amazon S3. Until it has, your server will continue to serve image content to your visitors. Click <a href="%url" class="g-dialog-link">here</a> to start the synchronisation task.',
|
||||
array("url" => html::mark_clean(url::site("admin/maintenance/start/aws_s3_task::manual_sync?csrf=__CSRF__")))
|
||||
),
|
||||
"aws_s3_not_synced"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
message::success(t("Settings have been saved"));
|
||||
url::redirect("admin/aws_s3");
|
||||
}
|
||||
else {
|
||||
message::error(t("There was a problem with the submitted form. Please check your values and try again."));
|
||||
if (!$valid_form)
|
||||
message::error(t("There was a problem with the submitted form. Please check your values and try again."));
|
||||
if (!$s3_axs_correct) {
|
||||
message::error(t("The Amazon S3 access details provided appear to be incorrect. Please check your values and try again."));
|
||||
$form->aws_s3->access_key->add_error("invalid", true);
|
||||
$form->aws_s3->secret_key->add_error("invalid", true);
|
||||
$form->aws_s3->bucket_name->add_error("invalid", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -51,10 +104,15 @@ class Admin_Aws_S3_Controller extends Admin_Controller {
|
|||
|
||||
$group = $form->group("aws_s3")->label(t("Amazon S3 Settings"));
|
||||
|
||||
$group ->checkbox("enabled")
|
||||
->id("s3-enabled")
|
||||
->checked(module::get_var("aws_s3", "enabled"))
|
||||
->label("S3 enabled");
|
||||
$chkbox =
|
||||
$group ->checkbox("enabled")
|
||||
->id("s3-enabled")
|
||||
->checked(module::get_var("aws_s3", "enabled", true))
|
||||
->label("S3 enabled");
|
||||
|
||||
if (module::get_var("aws_s3", "s3_storage_only"))
|
||||
$chkbox->disabled(true)
|
||||
->message("<strong>Warning</strong>:You may not turn this option off as <strong>S3 Storage Only</strong> is enabled. In order to disable using S3, you must first disable <strong>S3 Storage Only</strong> to re-download your content from Amazon S3, since it does not yet exist on the local server.");
|
||||
|
||||
$group ->input("access_key")
|
||||
->id("s3-access-key")
|
||||
|
|
@ -62,22 +120,27 @@ class Admin_Aws_S3_Controller extends Admin_Controller {
|
|||
->value(module::get_var("aws_s3", "access_key"))
|
||||
->rules("required")
|
||||
->error_messages("required", "This field is required")
|
||||
->message('<a target="_blank" href="https://aws-portal.amazon.com/gp/aws/developer/account/index.html?ie=UTF8&action=access-key">Sign up to Amazon S3</a>');
|
||||
->error_messages("invalid", "Access Key is invalid")
|
||||
->message('<a target="_blank" href="https://aws-portal.amazon.com/gp/aws/developer/account/index.html?ie=UTF8&action=access-key">Click here</a> to sign up to Amazon Web Services.');
|
||||
|
||||
$group ->input("secret_key")
|
||||
->id("s3-secret-key")
|
||||
->label("Secret Access Key")
|
||||
->value(module::get_var("aws_s3", "secret_key"))
|
||||
->rules("required")
|
||||
->error_messages("required", "This field is required");
|
||||
->error_messages("required", "This field is required")
|
||||
->error_messages("invalid", "Secret Key is invalid");
|
||||
|
||||
$group ->input("bucket_name")
|
||||
->id("s3-bucket")
|
||||
->label("Bucket Name")
|
||||
->value(module::get_var("aws_s3", "bucket_name"))
|
||||
->rules("required")
|
||||
->callback("aws_s3::validate_bucket")
|
||||
->error_messages("required", "This field is required")
|
||||
->message("Note: This module will not create a bucket if it does not already exist. Please ensure you have already created the bucket and the bucket has the correct ACL permissions before continuing.");
|
||||
->error_messages("invalid", "Bucket name is invalid")
|
||||
->message('Note: This module will not create a bucket if it does not already exist. Please ensure you have already created the bucket using the <a href="https://console.aws.amazon.com/s3/home" target="_blank">AWS Console</a> before continuing.<br />
|
||||
<a href="http://docs.amazonwebservices.com/AmazonS3/latest/index.html?UsingBucket.html" tar=get="_blank">Click here</a> for information on Amazon S3 bucket naming conventions/restrictions.');
|
||||
|
||||
$group ->input("g3id")
|
||||
->id("s3-g3id")
|
||||
|
|
@ -85,12 +148,13 @@ class Admin_Aws_S3_Controller extends Admin_Controller {
|
|||
->value(module::get_var("aws_s3", "g3id", md5(time())))
|
||||
->rules("required")
|
||||
->error_messages("required", "This field is required")
|
||||
->message("This field allows for multiple G3 instances running off of a single S3 bucket.");
|
||||
->message("Utilising this field allows for multiple G3 file repositories stored inside the same S3 bucket.");
|
||||
|
||||
$group ->checkbox("use_ssl")
|
||||
->id("s3-use-ssl")
|
||||
->checked(module::get_var("aws_s3", "use_ssl"))
|
||||
->label("Use SSL for S3 transfers");
|
||||
->label("Use SSL for S3 transfers")
|
||||
->message("<span style='font-style: italic'>You may have problems when uploading content to S3 if this option is enabled. If so, turn off this option.</span>");
|
||||
|
||||
$group = $form->group("cdn_settings")->label(t("CDN Settings"));
|
||||
|
||||
|
|
@ -105,15 +169,54 @@ class Admin_Aws_S3_Controller extends Admin_Controller {
|
|||
• {resource} - The end path to the resource/object");
|
||||
|
||||
$group ->input("sig_exp")
|
||||
->id("sig_exp")
|
||||
->id("s3-sig_exp")
|
||||
->label("Private Content Signature Duration")
|
||||
->value(module::get_var("aws_s3", "sig_exp", 60))
|
||||
->rules("required")
|
||||
->callback("aws_s3::validate_number")
|
||||
->error_messages("not_numeric", "The value provided is not numeric. Please enter a number in this field.")
|
||||
->message("Set the time in seconds for the generated signature for access to permission-restricted S3 objects<br /><br />
|
||||
Note: this module does not yet support the creation of signatures to access private objects on S3 via CloudFront CDN.");
|
||||
->message("Set the time in seconds until the generated signature expires access to permission-restricted S3 objects (private content on G3 is where the user group 'Everybody' does not have access).<br /><br />
|
||||
<strong>Note</strong>: this module does not yet support the creation of signatures to access private objects on S3 via CloudFront CDN.");
|
||||
|
||||
$group = $form->group("general_settings")->label(t("General Settings"));
|
||||
|
||||
$chkbox =
|
||||
$group ->checkbox("upload_thumbs")
|
||||
->id("s3-upload_thumbs")
|
||||
->label("Upload Thumbnails")
|
||||
->checked(module::get_var("aws_s3", "upload_thumbs", true));
|
||||
if (module::get_var("aws_s3", "s3_storage_only"))
|
||||
$chkbox->disabled(true);
|
||||
|
||||
$chkbox =
|
||||
$group ->checkbox("upload_resizes")
|
||||
->id("s3-upload_resizes")
|
||||
->label("Upload Resized Images")
|
||||
->checked(module::get_var("aws_s3", "upload_resizes", true));
|
||||
if (module::get_var("aws_s3", "s3_storage_only"))
|
||||
$chkbox->disabled(true);
|
||||
|
||||
$chkbox =
|
||||
$group ->checkbox("upload_fullsizes")
|
||||
->id("s3-upload_fullsizes")
|
||||
->label("Upload Fullsize Images")
|
||||
->checked(module::get_var("aws_s3", "upload_fullsizes", true));
|
||||
if (module::get_var("aws_s3", "s3_storage_only"))
|
||||
$chkbox->disabled(true);
|
||||
|
||||
$chkbox =
|
||||
$group ->checkbox("s3_storage_only")
|
||||
->id("s3-storage-only")
|
||||
->label("Use S3 for primary storage of Gallery content (Not yet available)")
|
||||
->checked(module::get_var("aws_s3", "s3_storage_only", false))
|
||||
->message("Use this option if your webhost has limited space available on your account. This module will remove content from the local server after it has been uploaded to S3.<br /><br />
|
||||
<strong>Note</strong>: You must have enough storage on your webhost account to store the images temporarily until they have been uploaded to S3.<br />")
|
||||
->disabled(true);
|
||||
|
||||
if (!module::get_var("aws_s3", "enabled"))
|
||||
$chkbox->disabled(true);
|
||||
|
||||
// done creating form.
|
||||
$form ->submit("save")
|
||||
->value("Save Settings");
|
||||
|
||||
|
|
|
|||
9
3.0/modules/aws_s3/controllers/aws_s3.php
Normal file
9
3.0/modules/aws_s3/controllers/aws_s3.php
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?php
|
||||
|
||||
class Aws_S3_Controller extends Controller {
|
||||
|
||||
public function xdrfetch() {
|
||||
// cross-domain fetch to retain functionality for certain elements such as Organize..
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -26,7 +26,7 @@ class item extends item_Core {
|
|||
|
||||
$parent = $item->parent();
|
||||
if ($parent->id > 1) {
|
||||
aws_s3::upload_album_cover($parent);
|
||||
aws_s3::upload_item($parent);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ class item extends item_Core {
|
|||
parent::remove_album_cover($album);
|
||||
|
||||
if ($album->id > 1) {
|
||||
aws_s3::remove_album_cover($album);
|
||||
aws_s3::remove_item($album);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,11 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 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 aws_s3_Core {
|
||||
|
||||
const UPLOAD_FULLSIZE = 1;
|
||||
const UPLOAD_RESIZE = 2;
|
||||
const UPLOAD_THUMB = 4;
|
||||
|
||||
private static $_s3;
|
||||
|
||||
static function get_s3() {
|
||||
|
|
@ -78,102 +64,143 @@ class aws_s3_Core {
|
|||
fwrite($fh, date("Y-m-d H:i:s") . ": " . $item . "\n");
|
||||
fclose($fh);
|
||||
}
|
||||
|
||||
static function upload_item($item) {
|
||||
|
||||
static function upload_item($item, $flags = 7) {
|
||||
self::get_s3();
|
||||
|
||||
$success_fs = S3::putObjectFile(VARPATH . "albums/" . $item->relative_path(),
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("fs/" . $item->relative_path()),
|
||||
($item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
$success_th = S3::putObjectFile(VARPATH . "thumbs/" . $item->relative_path(),
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("th/" . $item->relative_path()),
|
||||
($item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
$success_rs = S3::putObjectFile(VARPATH . "resizes/" . $item->relative_path(),
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("rs/" . $item->relative_path()),
|
||||
($item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
$filename = urldecode($item->relative_path());
|
||||
$itype = "I";
|
||||
if ($item->is_album()) {
|
||||
$filename .= "/.album.jpg";
|
||||
$itype = "A";
|
||||
}
|
||||
|
||||
if ((!$item->s3_fullsize_uploaded || $flags & aws_s3::UPLOAD_FULLSIZE) && !$item->is_album()) {
|
||||
aws_s3::log("[" . $itype . ":" . $item->id . "] Uploading fullsize object");
|
||||
$success_fs = S3::putObjectFile(VARPATH . "albums/" . $filename,
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("fs/" . $filename),
|
||||
($item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
$item->s3_fullsize_uploaded = $success_fs;
|
||||
}
|
||||
else
|
||||
$success_fs = true;
|
||||
|
||||
if ((!$item->s3_resize_uploaded || $flags & aws_s3::UPLOAD_RESIZE) && !$item->is_album()) {
|
||||
aws_s3::log("[" . $itype . ":" . $item->id . "] Uploading resize object");
|
||||
$success_rs = S3::putObjectFile(VARPATH . "resizes/" . $filename,
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("rs/" . $filename),
|
||||
($item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
$item->s3_resize_uploaded = $success_rs;
|
||||
}
|
||||
else
|
||||
$success_rs = true;
|
||||
|
||||
if (!$item->s3_thumb_uploaded || $flags & aws_s3::UPLOAD_THUMB) {
|
||||
aws_s3::log("[" . $itype . ":" . $item->id . "] Uploading thumbnail object");
|
||||
$success_th = S3::putObjectFile(VARPATH . "thumbs/" . $filename,
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("th/" . $filename),
|
||||
($item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
$item->s3_thumb_uploaded = $success_th;
|
||||
}
|
||||
else
|
||||
$success_th = true;
|
||||
|
||||
$item->s3_item_hash = md5($item->relative_path());
|
||||
|
||||
$item->save();
|
||||
|
||||
$success = $success_fs && $success_th && $success_rs;
|
||||
aws_s3::log("item upload success: " . $success);
|
||||
return $success;
|
||||
}
|
||||
|
||||
static function move_item($old_item, $new_item) {
|
||||
self::get_s3();
|
||||
|
||||
S3::copyObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("fs/" . $old_item->relative_path()),
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("fs/" . $new_item->relative_path()),
|
||||
($new_item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("fs/" . $old_item->relative_path()));
|
||||
$old_filename = urldecode($old_item->relative_path());
|
||||
$new_filename = urldecode($new_item->relative_path());
|
||||
|
||||
S3::copyObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("rs/" . $old_item->relative_path()),
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("rs/" . $new_item->relative_path()),
|
||||
($new_item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("rs/" . $old_item->relative_path()));
|
||||
aws_s3::log("old filename: " . self::get_resource_url("fs/" . $old_filename) . ", " .
|
||||
"new filename: " . self::get_resource_url("fs/" . $new_filename));
|
||||
|
||||
S3::copyObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("th/" . $old_item->relative_path()),
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("th/" . $new_item->relative_path()),
|
||||
($new_item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("th/" . $old_item->relative_path()));
|
||||
//aws_s3::log($old_item->get_aws_s3_meta());
|
||||
|
||||
if ($old_item->s3_fullsize_uploaded) {
|
||||
aws_s3::log("Copying fullsize " . $old_filename . " to " . $new_filename);
|
||||
S3::copyObject(module::get_var("aws_s3", "bucket_name"), self::get_resource_url("fs/" . $old_filename),
|
||||
module::get_var("aws_s3", "bucket_name"), self::get_resource_url("fs/" . $new_filename),
|
||||
($new_item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
S3::deleteObject(module::get_var("aws_s3", "bucket_name"), self::get_resource_url("fs/" . $old_filename));
|
||||
}
|
||||
else
|
||||
aws_s3::upload_item($new_item, aws_s3::UPLOAD_FULLSIZE);
|
||||
|
||||
if ($old_item->s3_resize_uploaded) {
|
||||
aws_s3::log("Copying resized " . $old_filename . " to " . $new_filename);
|
||||
S3::copyObject(module::get_var("aws_s3", "bucket_name"), self::get_resource_url("rs/" . $old_filename),
|
||||
module::get_var("aws_s3", "bucket_name"), self::get_resource_url("rs/" . $new_filename),
|
||||
($new_item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
S3::deleteObject(module::get_var("aws_s3", "bucket_name"), self::get_resource_url("rs/" . $old_filename));
|
||||
}
|
||||
else
|
||||
aws_s3::upload_item($new_item, aws_s3::UPLOAD_RESIZE);
|
||||
|
||||
if ($old_item->s3_thumb_uploaded) {
|
||||
aws_s3::log("Copying thumbnail " . $old_filename . " to " . $new_filename);
|
||||
S3::copyObject(module::get_var("aws_s3", "bucket_name"), self::get_resource_url("th/" . $old_filename),
|
||||
module::get_var("aws_s3", "bucket_name"), self::get_resource_url("th/" . $new_filename),
|
||||
($new_item->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
S3::deleteObject(module::get_var("aws_s3", "bucket_name"), self::get_resource_url("th/" . $old_filename));
|
||||
}
|
||||
else
|
||||
aws_s3::upload_item($new_item, aws_s3::UPLOAD_THUMB);
|
||||
}
|
||||
|
||||
static function remove_item($item) {
|
||||
self::get_s3();
|
||||
|
||||
$success_fs = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("fs/" . $item->relative_path()));
|
||||
$success_th = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("th/" . $item->relative_path()));
|
||||
$success_rs = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("rs/" . $item->relative_path()));
|
||||
$filename = urldecode($item->relative_path());
|
||||
$itype = "I";
|
||||
if ($item->is_album()) {
|
||||
$filename .= "/.album.jpg";
|
||||
$itype = "A";
|
||||
}
|
||||
|
||||
$success = $success_fs && $success_th && $success_rs;
|
||||
aws_s3::log("s3 delete success: " . $success);
|
||||
}
|
||||
if ($item->s3_fullsize_uploaded && !$item->is_album()) {
|
||||
aws_s3::log("[" . $itype . ":" . $item->id . "] Deleting fullsize object");
|
||||
$success_fs = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("fs/" . $filename));
|
||||
$item->s3_fullsize_uploaded = !$success_fs;
|
||||
}
|
||||
else
|
||||
$success_fs = true;
|
||||
|
||||
static function upload_album_cover($album) {
|
||||
self::get_s3();
|
||||
|
||||
if (file_exists(VARPATH . "resizes/" . $album->relative_path() . "/.album.jpg"))
|
||||
$success_rs = S3::putObjectFile(VARPATH . "resizes/" . $album->relative_path() . "/.album.jpg",
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
"g3/" . module::get_var("aws_s3", "g3id") . "/rs/" . $album->relative_path() . "/.album.jpg",
|
||||
($album->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
if ($item->s3_resize_uploaded && !$item->is_album()) {
|
||||
aws_s3::log("[" . $itype . ":" . $item->id . "] Deleting resize object");
|
||||
$success_rs = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("rs/" . $filename));
|
||||
$item->s3_resize_uploaded = !$success_rs;
|
||||
}
|
||||
else
|
||||
$success_rs = true;
|
||||
|
||||
if (file_exists(VARPATH . "thumbs/" . $album->relative_path() . "/.album.jpg"))
|
||||
$success_th = S3::putObjectFile(VARPATH . "thumbs/" . $album->relative_path() . "/.album.jpg",
|
||||
module::get_var("aws_s3", "bucket_name"),
|
||||
"g3/" . module::get_var("aws_s3", "g3id") . "/th/" . $album->relative_path() . "/.album.jpg",
|
||||
($album->view_1 ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
|
||||
if ($item->s3_thumb_uploaded) {
|
||||
aws_s3::log("[" . $itype . ":" . $item->id . "] Deleting thumbnail object");
|
||||
$success_th = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
self::get_resource_url("th/" . $filename));
|
||||
$item->s3_thumb_uploaded = !$success_th;
|
||||
}
|
||||
else
|
||||
$success_th = true;
|
||||
|
||||
$item->save_s3_meta();
|
||||
|
||||
$success = $success_rs && $success_th;
|
||||
aws_s3::log("album cover upload success: " . $success);
|
||||
}
|
||||
|
||||
static function remove_album_cover($album) {
|
||||
self::get_s3();
|
||||
|
||||
$success_th = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
"g3/" . module::get_var("aws_s3", "g3id") . "/th/" . $album->relative_path() . "/.album.jpg");
|
||||
$success_rs = S3::deleteObject(module::get_var("aws_s3", "bucket_name"),
|
||||
"g3/" . module::get_var("aws_s3", "g3id") . "/rs/" . $album->relative_path() . "/.album.jpg");
|
||||
|
||||
$success = $success_rs && $success_th;
|
||||
aws_s3::log("album cover removal success: " . $success);
|
||||
$success = $success_fs && $success_th && $success_rs;
|
||||
aws_s3::log("S3 delete success: " . $success);
|
||||
return $success;
|
||||
}
|
||||
|
||||
static function getAuthenticatedURL($bucket, $uri) {
|
||||
|
|
@ -184,7 +211,108 @@ class aws_s3_Core {
|
|||
|
||||
static function validate_number($field) {
|
||||
if (preg_match("/\D/", $field->value))
|
||||
$field->add_error("not_numeric", 1);
|
||||
$field->add_error("not_numeric", 1);
|
||||
}
|
||||
|
||||
static function validate_bucket($field) {
|
||||
if (preg_match("/[^a-zA-Z0-9\-\.]/", $field->value))
|
||||
$field->add_error("invalid", 1);
|
||||
}
|
||||
|
||||
// @TODO: Write validation function (check with S3)
|
||||
static function validate_access_details($access_key, $secret_key, $bucket_name) {
|
||||
require_once(MODPATH . "aws_s3/lib/s3.php");
|
||||
S3::setAuth($access_key, $secret_key);
|
||||
S3::$useSSL = false;
|
||||
|
||||
$success_test = S3::putObjectString((string)time(), $bucket_name, ".s3_test");
|
||||
if ($success_test)
|
||||
S3::deleteObject($bucket_name, ".s3_test");
|
||||
|
||||
return $success_test;
|
||||
}
|
||||
|
||||
static function base64_filename(Item_Model $item) {
|
||||
$file_path = explode("/", $item->relative_path());
|
||||
return base64_encode(end($file_path));
|
||||
}
|
||||
|
||||
static function can_schedule() {
|
||||
if (!module::is_active("scheduler")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static function schedule_task($task) {
|
||||
$schedule = ORM::factory("schedule");
|
||||
$schedule->add_task($task);
|
||||
}
|
||||
|
||||
static function schedule_full_sync2() {
|
||||
$task_def =
|
||||
Task_Definition::factory()
|
||||
->callback("aws_s3_task::sync")
|
||||
->name("Amazon S3 bucket synchronisation")
|
||||
->severity(log::SUCCESS);
|
||||
|
||||
$task = task::create($task_def, array());
|
||||
self::schedule_task($task);
|
||||
}
|
||||
|
||||
static function schedule_full_sync($this_task) {
|
||||
if (!self::can_schedule())
|
||||
throw new Exception("Unable to initialize schedule");
|
||||
|
||||
try {
|
||||
self::schedule_full_sync2();
|
||||
|
||||
$this_task->status = "Scheduled re-sync task";
|
||||
$this_task->done = true;
|
||||
$this_task->state = "success";
|
||||
$this_task->percent_complete = 100;
|
||||
}
|
||||
catch (Exception $err) {
|
||||
$task->done = true;
|
||||
$thisSynchronise_task->state = "error";
|
||||
$this_task->status = $err->getMessage();
|
||||
$this_task->log((string)$err);
|
||||
}
|
||||
|
||||
$this_task->save();
|
||||
|
||||
if (!module::get_var("aws_s3", "synced", false)) {
|
||||
site_status::warning(
|
||||
"Your site has been scheduled for full Amazon S3 re-synchronisation. This message will clear when this has been completed.",
|
||||
"aws_s3_not_synced"
|
||||
);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static function schedule_item_sync($item) {
|
||||
if (!self::can_schedule())
|
||||
throw new Exception("Unable to initialize schedule");
|
||||
|
||||
$item_id = null;
|
||||
if (is_object($item) && $item instanceof Item_Model)
|
||||
$item_id = $item->id;
|
||||
else if (is_numeric($item))
|
||||
$item_id = $item;
|
||||
else
|
||||
throw new Exception("Un-intelligible item reference passed.");
|
||||
|
||||
$task_def =
|
||||
Task_Definition::factory()
|
||||
->callback("aws_s3_task::upload_item")
|
||||
->name("Amazon S3 item upload (ID: " . $item_id . ")")
|
||||
->severity(log::SUCCESS);
|
||||
|
||||
$task = task::create($task_def, array("item_id" => $item_id));
|
||||
|
||||
self::schedule_task($task);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,4 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 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 aws_s3_event_Core {
|
||||
|
||||
|
|
@ -32,21 +14,43 @@ class aws_s3_event_Core {
|
|||
}
|
||||
|
||||
static function item_created($item) {
|
||||
if ($item->is_album())
|
||||
if ($item->id == 1)
|
||||
return true;
|
||||
|
||||
aws_s3::log("Item created - " . $item->id);
|
||||
aws_s3::upload_item($item);
|
||||
aws_s3::schedule_item_sync($item);
|
||||
}
|
||||
|
||||
static function item_deleted($item) {
|
||||
if ($item->id == 1)
|
||||
return true;
|
||||
|
||||
aws_s3::log("Item deleted - " . $item->id);
|
||||
aws_s3::remove_item($item);
|
||||
|
||||
ORM::factory("aws_s3_meta", $item->id)->delete();
|
||||
}
|
||||
|
||||
static function item_moved($new_item, $old_item) {
|
||||
aws_s3::log("Item moved - " . $item->id);
|
||||
aws_s3::move_item($old_item, $new_item);
|
||||
static function item_updated($old_item, $new_item) {
|
||||
if ($new_item->id == 1)
|
||||
return true;
|
||||
|
||||
if ($new_item->has_aws_s3_meta()) {
|
||||
aws_s3::log("Item updated - " . $new_item->id);
|
||||
|
||||
if ($old_item->relative_path() == $new_item->relative_path() && $old_item->s3_item_hash == $new_item->s3_item_hash) {
|
||||
aws_s3::log("nothing changed?!");
|
||||
}
|
||||
else if ($old_item->relative_path() != $new_item->relative_path()) {
|
||||
aws_s3::log("Item moved...");
|
||||
aws_s3::move_item($old_item, $new_item);
|
||||
}
|
||||
else {
|
||||
aws_s3::log("Item hasn't moved. Image updated?");
|
||||
aws_s3::remove_item($old_item);
|
||||
aws_s3::schedule_item_sync($new_item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,57 +1,125 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 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 aws_s3_installer {
|
||||
|
||||
private static function getversion() { return 1; }
|
||||
private static function setversion() { module::set_version("aws_s3", self::getversion()); }
|
||||
|
||||
static function install() {
|
||||
@mkdir(VARPATH . "modules/aws_s3");
|
||||
@mkdir(VARPATH . "modules/aws_s3/log");
|
||||
|
||||
// installation's unique identifier - allows multiple g3's pointing to the same s3 bucket.
|
||||
if (!module::get_var("aws_s3", "g3id"))
|
||||
module::set_var("aws_s3", "g3id", md5(time()));
|
||||
|
||||
module::set_var("aws_s3", "synced", false);
|
||||
module::set_var("aws_s3", "enabled", false);
|
||||
module::set_var("aws_s3", "access_key", "");
|
||||
module::set_var("aws_s3", "secret_key", "");
|
||||
module::set_var("aws_s3", "bucket_name", "");
|
||||
|
||||
self::setversion();
|
||||
self::upgrade(0);
|
||||
}
|
||||
|
||||
static function uninstall() {
|
||||
dir::unlink(VARPATH . "modules/aws_s3");
|
||||
Database::instance()->query("DROP TABLE {aws_s3_meta}");
|
||||
}
|
||||
|
||||
static function upgrade($version) {
|
||||
if ($version < self::getversion())
|
||||
self::setversion();
|
||||
log::info("aws_s3", "Commencing module upgrade (" . $version . ")");
|
||||
switch ($version) {
|
||||
case 0: {
|
||||
log::info("aws_s3", "Installing version 1");
|
||||
|
||||
@mkdir(VARPATH . "modules/aws_s3");
|
||||
@mkdir(VARPATH . "modules/aws_s3/log");
|
||||
|
||||
// installation's unique identifier - allows multiple g3's pointing to the same s3 bucket.
|
||||
if (!module::get_var("aws_s3", "g3id"))
|
||||
module::set_var("aws_s3", "g3id", md5(time()));
|
||||
|
||||
module::set_var("aws_s3", "synced", false);
|
||||
module::set_var("aws_s3", "enabled", false);
|
||||
module::set_var("aws_s3", "access_key", "");
|
||||
module::set_var("aws_s3", "secret_key", "");
|
||||
module::set_var("aws_s3", "bucket_name", "");
|
||||
|
||||
module::set_version("aws_s3", 1);
|
||||
}
|
||||
case 1: {
|
||||
log::info("aws_s3", "Upgrading to version 2");
|
||||
$db = Database::instance();
|
||||
$db->query("CREATE TABLE {aws_s3_meta} (
|
||||
`item_id` int(9) NOT NULL,
|
||||
`item_hash` varchar(32) NOT NULL DEFAULT '',
|
||||
`thumb_uploaded` smallint(1) NOT NULL DEFAULT 0,
|
||||
`resize_uploaded` smallint(1) NOT NULL DEFAULT 0,
|
||||
`fullsize_uploaded` smallint(1) NOT NULL DEFAULT 0,
|
||||
`local_deleted` smallint(1) NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`item_id`)
|
||||
) DEFAULT CHARSET=utf8;");
|
||||
|
||||
module::set_var("aws_s3", "upload_thumbs", true);
|
||||
module::set_var("aws_s3", "upload_resizes", true);
|
||||
module::set_var("aws_s3", "upload_fullsizes", true);
|
||||
module::set_var("aws_s3", "s3_storage_only", false);
|
||||
|
||||
if (module::get_var("aws_s3", "synced")) {
|
||||
// v1 has already synced this installation to s3. mark all the items with the relevant meta data
|
||||
$items = ORM::factory("item")->find_all();
|
||||
foreach ($items as $item) {
|
||||
aws_s3::log("Updating S3 meta for item ID: " . $item->id);
|
||||
$item->s3_thumb_uploaded = true;
|
||||
if (!$item->is_album()) {
|
||||
$item->s3_resize_uploaded = true;
|
||||
$item->s3_fullsize_uploaded = true;
|
||||
}
|
||||
$item->s3_local_deleted = false;
|
||||
$item->s3_item_hash = md5($item->relative_path());
|
||||
$item->save_s3_meta();
|
||||
}
|
||||
}
|
||||
else {
|
||||
// check various states after upgrade from v1..
|
||||
|
||||
if (module::get_var("aws_s3", "access_key") != "" &&
|
||||
module::get_var("aws_s3", "secret_key") != "" &&
|
||||
module::get_var("aws_s3", "bucket_name") != "" &&
|
||||
aws_s3::validate_access_details(module::get_var("aws_s3", "access_key"),
|
||||
module::get_var("aws_s3", "secret_key"),
|
||||
module::get_var("aws_s3", "bucket_name"))
|
||||
) {
|
||||
// details are correct but hasn't been synced.
|
||||
if (aws_s3::can_schedule()) {
|
||||
// i can schedule this task
|
||||
aws_s3::schedule_full_sync2();
|
||||
site_status::warning(
|
||||
"Your site has been scheduled for full Amazon S3 re-synchronisation. This message will clear when this has been completed.",
|
||||
"aws_s3_not_synced"
|
||||
);
|
||||
}
|
||||
else {
|
||||
// i CAN'T schedule it..
|
||||
site_status::warning(
|
||||
t('Your site has not been synchronised to Amazon S3. Until it has, your server will continue to serve image content to your visitors.<br />Click <a href="%url" class="g-dialog-link">here</a> to start the synchronisation task.',
|
||||
array("url" => html::mark_clean(url::site("admin/maintenance/start/aws_s3_task::manual_sync?csrf=__CSRF__")))
|
||||
),
|
||||
"aws_s3_not_synced"
|
||||
);
|
||||
}
|
||||
}
|
||||
else {
|
||||
site_status::warning(
|
||||
t('Amazon S3 module needs configuration. Click <a href="%url">here</a> to go to the configuration page.',
|
||||
array("url" => html::mark_clean(url::site("admin/aws_s3")))
|
||||
),
|
||||
"aws_s3_not_configured"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
module::set_version("aws_s3", 2);
|
||||
}
|
||||
}
|
||||
log::info("aws_s3", "Module upgrade complete");
|
||||
}
|
||||
|
||||
static function deactivate() {}
|
||||
static function activate() {}
|
||||
static function can_activate() {
|
||||
$messages = array();
|
||||
if (!function_exists("curl_init")) {
|
||||
$messages['error'][] = "The S3 library (and this module) depend on the php5-curl extension. Please install this extension and try again.";
|
||||
}
|
||||
if (!module::is_active("scheduler")) {
|
||||
$messages['warn'][] = "The 'Scheduler' module is not installed/active. Scheduled maintenance tasks such as synchronisation will not be available.";
|
||||
}
|
||||
return $messages;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,96 +1,193 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 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 aws_s3_task_Core {
|
||||
|
||||
static function available_tasks() {
|
||||
return array(Task_Definition::factory()
|
||||
->callback("aws_s3_task::sync")
|
||||
->name(t("Syncronise with Amazon S3"))
|
||||
->description(t("Syncronise your Gallery 3 data/images with your Amazon S3 bucket"))
|
||||
->severity(log::SUCCESS));
|
||||
if (aws_s3::can_schedule())
|
||||
return array(Task_Definition::factory()
|
||||
->callback("aws_s3::schedule_full_sync")
|
||||
->name(t("Synchronise with Amazon S3"))
|
||||
->description(t("Schedule a task to synchronise your Gallery 3 data/images with your Amazon S3 bucket"))
|
||||
->severity(log::SUCCESS)
|
||||
->set_flags(Task_Definition::CAN_RUN_NOW));
|
||||
else
|
||||
return array(Task_Definition::factory()
|
||||
->callback("aws_s3_task::manual_sync")
|
||||
->name(t("Synchronise with Amazon S3"))
|
||||
->description(t("Synchronise your Gallery 3 data/images with your Amazon S3 bucket"))
|
||||
->severity(log::SUCCESS));
|
||||
|
||||
}
|
||||
|
||||
static function upload_item($task) {
|
||||
aws_s3::log("aws_s3_task::upload_item called");
|
||||
|
||||
$item = ORM::factory("item", $task->get("item_id"));
|
||||
|
||||
aws_s3::log("Commencing upload task for item " . $item->id);
|
||||
|
||||
$task->status = "Commencing upload";
|
||||
$task->percent_complete = 0;
|
||||
$task->save();
|
||||
if (aws_s3::upload_item($item)) {
|
||||
$task->percent_complete = 100;
|
||||
$task->done = true;
|
||||
$task->state = "success";
|
||||
$task->status = "Upload complete";
|
||||
}
|
||||
else {
|
||||
$task->done = false;
|
||||
$task->state = "error";
|
||||
$task->status = "Upload failed";
|
||||
}
|
||||
$task->save();
|
||||
}
|
||||
|
||||
static function manual_sync($task) {
|
||||
aws_s3::log("Amazon S3 manual re-sync started.");
|
||||
|
||||
if (!$task->get("mode")) {
|
||||
$task->set("mode", "init");
|
||||
}
|
||||
|
||||
aws_s3::log("mode: " . $task->get("mode"));
|
||||
switch ($task->get("mode")) {
|
||||
case "init": {
|
||||
batch::start();
|
||||
$items = ORM::factory("item")->find_all();
|
||||
$task->set("total_count", count($items));
|
||||
|
||||
if (count($items) <= 50)
|
||||
$task->set("batch", 1);
|
||||
else if (count($items) > 50 && count($items) <= 500)
|
||||
$task->set("batch", 5);
|
||||
else if (count($items) > 500 && count($items) <= 5000)
|
||||
$task->set("batch", 10);
|
||||
else if (count($items) > 5000)
|
||||
$task->set("batch", 25);
|
||||
|
||||
$task->set("completed", 0);
|
||||
$task->state = "running";
|
||||
|
||||
if (!module::get_var("aws_s3", "synced", false)) {
|
||||
$task->set("mode", "clean");
|
||||
$task->status = "Emptying contents of bucket";
|
||||
}
|
||||
else {
|
||||
$task->status = "Uploading items...";
|
||||
$task->percent_complete = 10;
|
||||
$task->set("mode", "upload");
|
||||
}
|
||||
} break;
|
||||
case "clean": {
|
||||
aws_s3::log("Emptying contents of bucket");
|
||||
|
||||
require_once(MODPATH . "aws_s3/lib/s3.php");
|
||||
$s3 = new S3(module::get_var("aws_s3", "access_key"), module::get_var("aws_s3", "secret_key"));
|
||||
|
||||
$bucket = module::get_var("aws_s3", "bucket_name");
|
||||
$resource = aws_s3::get_resource_url("");
|
||||
$stuff = array_reverse(S3::getBucket($bucket, $resource));
|
||||
$i = 0;
|
||||
foreach ($stuff as $uri => $item) {
|
||||
$i++;
|
||||
aws_s3::log("Removing " . $uri . " from S3");
|
||||
S3::deleteObject($bucket, $uri);
|
||||
$task->percent_complete = round(20 * ($i / count($stuff)));
|
||||
$task->save();
|
||||
}
|
||||
$task->set("mode", "upload");
|
||||
$task->status = "Uploading items...";
|
||||
} break;
|
||||
case "upload": {
|
||||
$items = ORM::factory("item")->find_all($task->get("batch"), $task->get("completed"));
|
||||
foreach ($items as $item) {
|
||||
aws_s3::upload_item($item);
|
||||
$task->set("completed", $task->get("completed") + 1);
|
||||
}
|
||||
$task->percent_complete = (90 * ($task->get("completed") / $task->get("total_count"))) + 10;
|
||||
$task->status = "Uploaded " . $task->get("completed") . " of " . $task->get("total_count") . " items...";
|
||||
|
||||
if ($task->get("completed") == $task->get("total_count")) {
|
||||
$task->set("mode", "complete");
|
||||
}
|
||||
} break;
|
||||
case "complete": {
|
||||
$task->done = true;
|
||||
$task->state = "success";
|
||||
$task->percent_complete = 100;
|
||||
$task->status = "Completed.";
|
||||
module::set_var("aws_s3", "synced", true);
|
||||
site_status::clear("aws_s3_not_synced");
|
||||
batch::stop();
|
||||
} break;
|
||||
}
|
||||
aws_s3::log("End of function..");
|
||||
$task->save();
|
||||
}
|
||||
|
||||
static function sync($task) {
|
||||
require_once(MODPATH . "aws_s3/lib/s3.php");
|
||||
$s3 = new S3(module::get_var("aws_s3", "access_key"), module::get_var("aws_s3", "secret_key"));
|
||||
|
||||
$mode = $task->get("mode", "init");
|
||||
switch ($mode) {
|
||||
case "init": {
|
||||
aws_s3::log("re-sync task started..");
|
||||
batch::start();
|
||||
$items = ORM::factory("item")->find_all();
|
||||
aws_s3::log("items to sync: " . count($items));
|
||||
$task->set("total_count", count($items));
|
||||
$task->set("completed", 0);
|
||||
$task->set("mode", "empty");
|
||||
$task->status = "Emptying contents of bucket";
|
||||
} break;
|
||||
case "empty": { // 0 - 10%
|
||||
aws_s3::log("emptying bucket contents (any files that may already exist in the bucket/prefix path)");
|
||||
$bucket = module::get_var("aws_s3", "bucket_name");
|
||||
aws_s3::log("Amazon S3 Re-sync task started..");
|
||||
|
||||
$resource = aws_s3::get_resource_url("");
|
||||
$stuff = array_reverse(S3::getBucket($bucket, $resource));
|
||||
foreach ($stuff as $uri => $item) {
|
||||
aws_s3::log("removing: " . $uri);
|
||||
S3::deleteObject($bucket, $uri);
|
||||
}
|
||||
$task->percent_complete = 10;
|
||||
$task->set("mode", "upload");
|
||||
$task->state = "Commencing upload...";
|
||||
} break;
|
||||
case "upload": { // 10 - 100%
|
||||
$completed = $task->get("completed", 0);
|
||||
$items = ORM::factory("item")->find_all(1, $completed);
|
||||
foreach ($items as $item) {
|
||||
if ($item->id > 1) {
|
||||
aws_s3::log("uploading item " . $item->id . " (" . ($completed + 1) . "/" . $task->get("total_count") . ")");
|
||||
if ($item->is_album())
|
||||
aws_s3::upload_album_cover($item);
|
||||
else
|
||||
aws_s3::upload_item($item);
|
||||
}
|
||||
$completed++;
|
||||
}
|
||||
$task->set("completed", $completed);
|
||||
$task->percent_complete = round(90 * ($completed / $task->get("total_count"))) + 10;
|
||||
$task->status = $completed . " of " . $task->get("total_count"). " uploaded.";
|
||||
batch::start();
|
||||
$items = ORM::factory("item")->find_all();
|
||||
|
||||
if ($completed == $task->get("total_count")) {
|
||||
$task->set("mode", "finish");
|
||||
}
|
||||
} break;
|
||||
case "finish": {
|
||||
aws_s3::log("completing upload task..");
|
||||
$task->percent_complete = 100;
|
||||
$task->state = "success";
|
||||
$task->done = true;
|
||||
$task->status = "Sync task completed successfully";
|
||||
batch::stop();
|
||||
module::set_var("aws_s3", "synced", true);
|
||||
site_status::clear("aws_s3_not_synced");
|
||||
} break;
|
||||
$task->set("total_count", count($items));
|
||||
$task->set("completed", 0);
|
||||
|
||||
if (!module::get_var("aws_s3", "synced", false)) {
|
||||
aws_s3::log("Emptying contents of bucket");
|
||||
$task->status = "Emptying contents of bucket";
|
||||
$task->save();
|
||||
|
||||
require_once(MODPATH . "aws_s3/lib/s3.php");
|
||||
$s3 = new S3(module::get_var("aws_s3", "access_key"), module::get_var("aws_s3", "secret_key"));
|
||||
|
||||
$bucket = module::get_var("aws_s3", "bucket_name");
|
||||
$resource = aws_s3::get_resource_url("");
|
||||
$stuff = array_reverse(S3::getBucket($bucket, $resource));
|
||||
$i = 0;
|
||||
foreach ($stuff as $uri => $item) {
|
||||
$i++;
|
||||
aws_s3::log("Removing " . $uri . " from S3");
|
||||
S3::deleteObject($bucket, $uri);
|
||||
$task->percent_complete = round(20 * ($i / count($stuff)));
|
||||
$task->save();
|
||||
}
|
||||
}
|
||||
|
||||
$task->percent_complete = 20;
|
||||
aws_s3::log("Commencing upload tasks");
|
||||
$task->state = "Commencing upload...";
|
||||
$task->save();
|
||||
|
||||
$completed = $task->get("completed", 0);
|
||||
|
||||
$items = ORM::factory("item")->find_all();
|
||||
foreach ($items as $item) {
|
||||
try {
|
||||
if ($item->id > 1)
|
||||
aws_s3::upload_item($item);
|
||||
}
|
||||
catch (Exception $err) {}
|
||||
$completed++;
|
||||
|
||||
$task->set("completed", $completed);
|
||||
$task->percent_complete = round(80 * ($completed / $task->get("total_count"))) + 20;
|
||||
$task->status = $completed . " of " . $task->get("total_count"). " uploaded.";
|
||||
$task->save();
|
||||
}
|
||||
|
||||
$task->percent_complete = 100;
|
||||
$task->state = "success";
|
||||
$task->done = true;
|
||||
aws_s3::log("Sync task completed successfully");
|
||||
$task->status = "Sync task completed successfully";
|
||||
module::set_var("aws_s3", "synced", true);
|
||||
site_status::clear("aws_s3_not_synced");
|
||||
batch::stop();
|
||||
|
||||
$task->save();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -302,7 +302,7 @@ class S3 {
|
|||
if ($input === false) return false;
|
||||
$rest = new S3Request('PUT', $bucket, $uri);
|
||||
|
||||
if (is_string($input)) $input = array(
|
||||
if (is_string($input) || is_numeric($input)) $input = array(
|
||||
'data' => $input, 'size' => strlen($input),
|
||||
'md5sum' => base64_encode(md5($input, true))
|
||||
);
|
||||
|
|
@ -1218,8 +1218,10 @@ final class S3Request {
|
|||
curl_setopt($curl, CURLOPT_USERAGENT, 'S3/php');
|
||||
|
||||
if (S3::$useSSL) {
|
||||
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
|
||||
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
|
||||
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER , false );
|
||||
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST , false );
|
||||
// curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
|
||||
// curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
|
||||
}
|
||||
|
||||
curl_setopt($curl, CURLOPT_URL, $url);
|
||||
|
|
|
|||
|
|
@ -1,57 +1,89 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 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 Item_Model extends Item_Model_Core {
|
||||
|
||||
private $_aws_s3_meta;
|
||||
|
||||
public function thumb_url($full_uri=false) {
|
||||
if (!module::get_var("aws_s3", "enabled"))
|
||||
if (!module::get_var("aws_s3", "enabled")|| Router::$controller == "rest" || !$this->s3_thumb_uploaded)
|
||||
return parent::thumb_url($full_uri);
|
||||
|
||||
if ($this->is_photo()) {
|
||||
if ($this->is_photo())
|
||||
return aws_s3::generate_url("th/" . $this->relative_path(), ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
}
|
||||
else if ($this->is_album() && $this->id > 1) {
|
||||
else if ($this->is_album() && $this->id > 1)
|
||||
return aws_s3::generate_url("th/" . $this->relative_path() . "/.album.jpg", ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
}
|
||||
else if ($this->is_movie()) {
|
||||
$relative_path = preg_replace("/...$/", "jpg", $this->relative_path());
|
||||
return aws_s3::generate_url("th/" . $relative_path, ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
}
|
||||
else if ($this->is_movie())
|
||||
return aws_s3::generate_url("th/" . preg_replace("/...$/", "jpg", $this->relative_path()), ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
}
|
||||
|
||||
public function file_url($full_uri=false) {
|
||||
if (!module::get_var("aws_s3", "enabled"))
|
||||
if (!module::get_var("aws_s3", "enabled") || Router::$controller == "rest" || !$this->s3_fullsize_uploaded)
|
||||
return parent::file_url($full_uri);
|
||||
|
||||
return aws_s3::generate_url("fs/" . $this->relative_path(), ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
}
|
||||
|
||||
public function resize_url($full_uri=false) {
|
||||
if (!module::get_var("aws_s3", "enabled"))
|
||||
if (!module::get_var("aws_s3", "enabled") || Router::$controller == "rest" || !$this->s3_resize_uploaded)
|
||||
return parent::resize_url($full_uri);
|
||||
|
||||
if ($this->is_album() && $this->id > 1) {
|
||||
if ($this->is_album() && $this->id > 1)
|
||||
return aws_s3::generate_url("rs/" . $this->relative_path() . "/.album.jpg", ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
else
|
||||
return aws_s3::generate_url("rs/" . $this->relative_path(), ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
}
|
||||
|
||||
private function _load_aws_s3_meta($create_if_not_exists = true) {
|
||||
$this->_aws_s3_meta = ORM::factory("aws_s3_meta")->find($this->id);
|
||||
if (!$this->_aws_s3_meta->item_id) {
|
||||
if ($create_if_not_exists) {
|
||||
$this->_aws_s3_meta->item_id = $this->id;
|
||||
$this->_aws_s3_meta->save();
|
||||
}
|
||||
else
|
||||
return false;
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function has_aws_s3_meta() {
|
||||
if (!$this->_load_aws_s3_meta(false))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
public function get_aws_s3_meta() {
|
||||
if (!$this->_aws_s3_meta)
|
||||
$this->_load_aws_s3_meta();
|
||||
|
||||
return $this->_aws_s3_meta;
|
||||
}
|
||||
|
||||
public function save_s3_meta() {
|
||||
if ($this->_aws_s3_meta)
|
||||
$this->_aws_s3_meta->save();
|
||||
}
|
||||
|
||||
public function save() {
|
||||
$this->save_s3_meta();
|
||||
return parent::save();
|
||||
}
|
||||
|
||||
public function __get($column) {
|
||||
if (substr($column, 0, 3) == "s3_") {
|
||||
$var = substr($column, 3);
|
||||
return $this->get_aws_s3_meta()->$var;
|
||||
}
|
||||
return parent::__get($column);
|
||||
}
|
||||
|
||||
public function __set($column, $value) {
|
||||
if (substr($column, 0, 3) == "s3_") {
|
||||
$var = substr($column, 3);
|
||||
$this->get_aws_s3_meta()->$var = $value;
|
||||
}
|
||||
else {
|
||||
return aws_s3::generate_url("rs/" . $this->relative_path(), ($this->view_1 == 1 ? false : true), $this->updated);
|
||||
parent::__set($column, $value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
6
3.0/modules/aws_s3/models/aws_s3_meta.php
Normal file
6
3.0/modules/aws_s3/models/aws_s3_meta.php
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
|
||||
class Aws_S3_Meta_Model extends ORM {
|
||||
protected $primary_key = "item_id";
|
||||
protected $table_names_plural = false;
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
name = "Amazon S3"
|
||||
description = "Seamlessly transfer your Gallery data to Amazon S3 CDN for a lightning fast gallery"
|
||||
version = 1
|
||||
version = 2
|
||||
|
|
|
|||
10
3.0/modules/aws_s3/todo.txt
Normal file
10
3.0/modules/aws_s3/todo.txt
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
Things to implement
|
||||
|
||||
v3;
|
||||
|
||||
1 - S3 as primary storage (remove from local storage when uploaded)
|
||||
|
||||
v4;
|
||||
|
||||
1 - Resolve issues with security/authentication (QSA) when using CloudFront CDN
|
||||
2 - Resolve problem using SSL for server -> S3 file transfers
|
||||
|
|
@ -1,10 +1,13 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||
|
||||
<div id="g-admin-code-block">
|
||||
|
||||
<h2><?= t("Amazon S3") ?></h2>
|
||||
|
||||
<p><?php echo t("Amazon S3 is a lightning fast Content Delivery Network. It's used for high-traffic sites to offload the bandwidth and processing required to vend vast quantities of data (pictures, videos, etc) to the cloud, leaving the local server only the tasks of running Gallery and vending small HTML pages."); ?></p>
|
||||
|
||||
<p><?php echo t("Like this module? Consider <a href=\"https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FJR8JFUDRPPGG\" target=\"_blank\">donating</a> to help support future development."); ?>
|
||||
|
||||
<div class="g-block-content">
|
||||
<?php echo $form; ?>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
class basket_theme_Core {
|
||||
|
||||
static function head($theme) {
|
||||
$theme->css("basket.css");
|
||||
return $theme->css("basket.css");
|
||||
}
|
||||
|
||||
static function header_top($theme) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -20,6 +20,6 @@
|
|||
class calendarview_theme_Core {
|
||||
|
||||
static function head($theme) {
|
||||
$theme->css("calendarview_menu.css");
|
||||
return $theme->css("calendarview_menu.css");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 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 custom_albums_event_Core {
|
||||
static function item_edit_form($item, $form) {
|
||||
if ($item->is_album()) {
|
||||
$albumCustom = ORM::factory("custom_album")->where("album_id", "=", $item->id)->find();
|
||||
|
||||
$thumbdata = $form->edit_item->group("custom_album")->label("Custom Album");
|
||||
|
||||
if ($albumCustom->loaded()) {
|
||||
$thumbdata->input("thumbsize")->label(t("Thumbnail size (in pixels)"))->value($albumCustom->thumb_size);
|
||||
} else {
|
||||
$thumbdata->input("thumbsize")->label(t("Thumbnail size (in pixels)"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static function item_edit_form_completed($item, $form) {
|
||||
if ($item->is_album()) {
|
||||
$thumbChanged = false;
|
||||
|
||||
if ($form->edit_item->custom_album->thumbsize->value == "") {
|
||||
db::build()
|
||||
->delete("custom_album")
|
||||
->where("album_id", "=", $item->id)
|
||||
->execute();
|
||||
} else {
|
||||
$albumCustom = ORM::factory("custom_album")->where("album_id", "=", $item->id)->find();
|
||||
if (!$albumCustom->loaded()) {
|
||||
$albumCustom->album_id = $item->id;
|
||||
}
|
||||
$albumCustom->thumb_size = $form->edit_item->custom_album->thumbsize->value;
|
||||
$albumCustom->save();
|
||||
|
||||
$thumbChanged = true;
|
||||
}
|
||||
|
||||
if ($thumbChanged) {
|
||||
db::build()
|
||||
->update("items")
|
||||
->set("thumb_dirty", 1)
|
||||
->where("parent_id", "=", $item->id)
|
||||
->execute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static function theme_edit_form_completed($form) {
|
||||
// Update our resize rules, in case the thumbnail or resize size has changed
|
||||
custom_albums_installer::update_rules();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 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 custom_albums_installer {
|
||||
static function install() {
|
||||
// Create a table to store custom album info in.
|
||||
$db = Database::instance();
|
||||
|
||||
$db->query(
|
||||
"CREATE TABLE IF NOT EXISTS {custom_albums} (
|
||||
`id` int(9) NOT NULL auto_increment,
|
||||
`album_id` int(9) NOT NULL,
|
||||
`thumb_size` int(9) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `album_id` (`album_id`,`id`)
|
||||
) DEFAULT CHARSET=utf8;"
|
||||
);
|
||||
|
||||
custom_albums_installer::update_rules();
|
||||
|
||||
module::set_version("custom_albums", 1);
|
||||
}
|
||||
|
||||
static function uninstall() {
|
||||
// Delete the custom album table before uninstalling.
|
||||
$db = Database::instance();
|
||||
$db->query("DROP TABLE IF EXISTS {custom_albums};");
|
||||
module::delete("custom_albums");
|
||||
}
|
||||
|
||||
static function update_rules() {
|
||||
// Make sure our thumb size matches the gallery one
|
||||
$thumb_size = module::get_var("gallery", "thumb_size");
|
||||
if ($thumb_size != module::get_var("custom_albums", "thumb_size")) {
|
||||
// Remove and readd our rule with the latest thumb size
|
||||
graphics::remove_rule("custom_albums", "thumb", "custom_albums_graphics::build_thumb");
|
||||
graphics::add_rule(
|
||||
"custom_albums", "thumb", "custom_albums_graphics::build_thumb",
|
||||
array("width" => $thumb_size, "height" => $thumb_size, "master" => Image::AUTO),
|
||||
101);
|
||||
|
||||
// Deactivate the gallery thumbnail generation, we'll handle it now
|
||||
graphics::deactivate_rules("gallery");
|
||||
|
||||
module::set_var("custom_albums", "thumb_size", $thumb_size);
|
||||
}
|
||||
|
||||
// Make sure our resize size matches the gallery one
|
||||
$resize_size = module::get_var("gallery", "resize_size");
|
||||
if ($resize_size != module::get_var("custom_albums", "resize_size")) {
|
||||
// Remove and readd our rule with the latest resize size
|
||||
graphics::remove_rule("custom_albums", "resize", "custom_albums_graphics::build_resize");
|
||||
graphics::add_rule(
|
||||
"custom_albums", "resize", "custom_albums_graphics::build_resize",
|
||||
array("width" => $resize_size, "height" => $resize_size, "master" => Image::AUTO),
|
||||
101);
|
||||
|
||||
// Deactivate the gallery resize, we'll handle it now
|
||||
graphics::deactivate_rules("gallery");
|
||||
|
||||
module::set_var("custom_albums", "resize_size", $resize_size);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
class Custom_Album_Model extends ORM
|
||||
{
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
name = "Custom Albums"
|
||||
description = "Lets you set custom thumbnail sizes for albums"
|
||||
version = 1
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -19,6 +19,6 @@
|
|||
*/
|
||||
class downloadalbum_theme {
|
||||
static function head($theme) {
|
||||
$theme->css("downloadalbum_menu.css");
|
||||
return $theme->css("downloadalbum_menu.css");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
class downloadfullsize_theme {
|
||||
static function head($theme) {
|
||||
if ($theme->item && access::can("view_full", $theme->item)) {
|
||||
$theme->css("downloadfullsize_menu.css");
|
||||
return $theme->css("downloadfullsize_menu.css");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -30,10 +30,12 @@ class Admin_ecard_Controller extends Admin_Controller {
|
|||
access::verify_csrf();
|
||||
$form = $this->_get_admin_form();
|
||||
if ($form->validate()) {
|
||||
module::set_var("ecard", "sender", $form->ecard->sender->value);
|
||||
module::set_var("ecard","send_plain",$form->ecard->send_plain->value);
|
||||
module::set_var("ecard", "sender", $form->ecard->sender->value);
|
||||
module::set_var("ecard", "bcc", $form->ecard->bcc->value);
|
||||
module::set_var("ecard", "subject", $form->ecard->subject->value);
|
||||
module::set_var("ecard", "message", $form->ecard->message->value);
|
||||
module::set_var("ecard", "max_length", $form->ecard->max_length->value);
|
||||
module::set_var("ecard", "access_permissions", $form->ecard->access_permissions->value);
|
||||
module::set_var("ecard", "location", $form->ecard->location->value);
|
||||
message::success(t("eCard settings updated"));
|
||||
|
|
@ -54,9 +56,18 @@ class Admin_ecard_Controller extends Admin_Controller {
|
|||
->value(module::get_var("ecard", "bcc", ""));
|
||||
$ecard_settings->input("subject")->label(t("E-mail subject"))
|
||||
->value(module::get_var("ecard", "subject"));
|
||||
$ecard_settings->textarea("message")->label(t("E-mail message. Valid keywords are \"%toname\" (recipient's name) and \"%fromname\" (sender's name))"))
|
||||
$ecard_settings->textarea("message")->label(t("E-mail message. Valid keywords are \"%fromname\" (sender's name))"))
|
||||
->value(module::get_var("ecard", "message"));
|
||||
$ecard_settings->dropdown("access_permissions")
|
||||
$ecard_settings->input("max_length")
|
||||
->label(t("Maximum message length"))
|
||||
->value(module::get_var("ecard","max_length"));
|
||||
if(module::is_active("watermark")) {
|
||||
$ecard_settings->checkbox("send_plain")
|
||||
->label(t("Allow users to send non-watermarked versions"))
|
||||
->value(true)
|
||||
->checked(module::get_var("ecard","send_plain"));
|
||||
}
|
||||
$ecard_settings->dropdown("access_permissions")
|
||||
->label(t("Who can send eCards?"))
|
||||
->options(array("everybody" => t("Everybody"),
|
||||
"registered_users" => t("Only registered users")))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -40,29 +40,51 @@ class Ecard_Controller extends Controller {
|
|||
}
|
||||
|
||||
if ($valid) {
|
||||
$v = new View("ecard_email.html");
|
||||
$v->item = $item;
|
||||
$v->subject = module::get_var("ecard", "subject");
|
||||
$to_name = $form->send_ecard->to_name->value;
|
||||
$from_name = $form->send_ecard->from_name->value;
|
||||
$bcc = module::get_var("ecard", "bcc");
|
||||
$v->message = t(module::get_var("ecard", "message"), array("toname" => $to_name, "fromname" => $from_name));
|
||||
$v->custom_message = $form->send_ecard->text->value;
|
||||
$v->image = $item->name;
|
||||
$to = $form->send_ecard->inputs["to_email"]->value;
|
||||
$from = $form->send_ecard->inputs["from_email"]->value;
|
||||
$headers = array("from" => $from_name."<".$from.">", "to" => $to, "subject" => module::get_var("ecard", "subject"));
|
||||
require_once(MODPATH. "ecard/lib/mime.php");
|
||||
$mime = new Mail_mime("\n");
|
||||
$mime->setHTMLBody($v->render());
|
||||
$mime->addHTMLImage($item->resize_path(),$item->mime_type,$item->name);
|
||||
$body = $mime->get(array('html_charset' => 'UTF-8', 'text_charset' => 'UTF-8','text_encoding' => '8bit','head_charset' => 'UTF-8'));
|
||||
self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc);
|
||||
$to_array = explode(",",$form->send_ecard->inputs["to_email"]->value);
|
||||
foreach($to_array as $to) {
|
||||
$v = new View("ecard_email.html");
|
||||
$v->item = $item;
|
||||
$v->subject = module::get_var("ecard", "subject");
|
||||
$from_name = $form->send_ecard->from_name->value;
|
||||
$bcc = module::get_var("ecard", "bcc");
|
||||
if($form->send_ecard->send_to_self->checked == true) {
|
||||
$cc = $form->send_ecard->inputs["from_email"]->value;
|
||||
}
|
||||
$v->message = t(module::get_var("ecard", "message"), array("fromname" => $from_name));
|
||||
$v->custom_message = $form->send_ecard->text->value;
|
||||
$v->image = $item->name;
|
||||
$from = $form->send_ecard->inputs["from_email"]->value;
|
||||
$headers = array("from" => $from_name."<".$from.">", "to" => $to, "subject" => module::get_var("ecard", "subject"));
|
||||
require_once(MODPATH. "ecard/lib/mime.php");
|
||||
$mime = new Mail_mime("\n");
|
||||
$mime->setHTMLBody($v->render());
|
||||
if($form->send_ecard->send_fresh->checked == true) {
|
||||
$tmpfile = tempnam(TMPPATH, "clean");
|
||||
if($form->send_ecard->send_thumbnail->checked == true) {
|
||||
$options = array("width" => module::get_var("gallery", "thumb_size"), "height" => module::get_var("gallery", "thumb_size"), "master" => Image::AUTO);
|
||||
gallery_graphics::resize($item->file_path(), $tmpfile, $options);
|
||||
$mime->addHTMLImage($tmpfile,$item->mime_type,$item->name);
|
||||
} else {
|
||||
$options = array("width" => module::get_var("gallery", "resize_size"), "height" => module::get_var("gallery", "resize_size"), "master" => Image::AUTO);
|
||||
gallery_graphics::resize($item->file_path(), $tmpfile, $options);
|
||||
$mime->addHTMLImage($tmpfile,$item->mime_type,$item->name);
|
||||
}
|
||||
} else {
|
||||
if($form->send_ecard->send_thumbnail->checked == true) {
|
||||
$mime->addHTMLImage($item->thumb_path(),$item->mime_type,$item->name);
|
||||
} else {
|
||||
$mime->addHTMLImage($item->resize_path(),$item->mime_type,$item->name);
|
||||
}
|
||||
}
|
||||
$body = $mime->get(array('html_charset' => 'UTF-8', 'text_charset' => 'UTF-8','text_encoding' => '8bit','head_charset' => 'UTF-8'));
|
||||
self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc, $cc);
|
||||
}
|
||||
unlink($tmpfile);
|
||||
message::success("eCard successfully sent");
|
||||
json::reply(array("result" => "success"));
|
||||
} else {
|
||||
} else {
|
||||
json::reply(array("result" => "error", "html" => (string) $form));
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Present a form for sending a new ecard.
|
||||
|
|
@ -73,9 +95,11 @@ class Ecard_Controller extends Controller {
|
|||
if (!ecard::can_send_ecard()) {
|
||||
access::forbidden();
|
||||
}
|
||||
print ecard::prefill_send_form(ecard::get_send_form($item));
|
||||
$v_form = new View("ecard_form.html");
|
||||
$v_form->item_id = $item_id;
|
||||
print $v_form->render();
|
||||
}
|
||||
private static function _notify($to, $from, $subject, $item, $text, $headers, $bcc) {
|
||||
private static function _notify($to, $from, $subject, $item, $text, $headers, $bcc, $cc) {
|
||||
$sendmail = Sendmail::factory();
|
||||
$sendmail
|
||||
->to($to)
|
||||
|
|
@ -84,6 +108,9 @@ class Ecard_Controller extends Controller {
|
|||
if(isset($bcc)) {
|
||||
$sendmail->header("bcc",$bcc);
|
||||
}
|
||||
if(isset($cc)) {
|
||||
$sendmail->header("cc",$cc);
|
||||
}
|
||||
foreach($headers as $key => $value) {
|
||||
$sendmail->header($key,$value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -24,8 +24,8 @@
|
|||
* Note: by design, this class does not do any permission checking.
|
||||
*/
|
||||
class ecard_Core {
|
||||
static function get_send_form($item) {
|
||||
$form = new Forge("ecard/send/{$item->id}", "", "post", array("id" => "g-ecard-form"));
|
||||
static function get_send_form($item_id) {
|
||||
$form = new Forge("ecard/send/{$item_id}", "", "post", array("id" => "g-ecard-form"));
|
||||
$group = $form->group("send_ecard")->label(t("Send eCard"));
|
||||
$group->input("from_name")
|
||||
->label(t("Your name"))
|
||||
|
|
@ -38,23 +38,32 @@ class ecard_Core {
|
|||
->rules("required|valid_email")
|
||||
->error_messages("required", t("You must enter a valid email address"))
|
||||
->error_messages("invalid", t("You must enter a valid email address"));
|
||||
$group->input("to_name")
|
||||
->label(t("Recipient's Name"))
|
||||
->id("g-recipient")
|
||||
->rules("required")
|
||||
->error_messages("required", t("You must enter a recipient's name"));
|
||||
$group->input("to_email")
|
||||
->label(t("Recipient's e-mail"))
|
||||
->label(t("Recipient's e-mail. Separate multiple recipients with a comma."))
|
||||
->id("g-recip-email")
|
||||
->rules("required|valid_email")
|
||||
->error_messages("required", t("You must enter a valid email address"))
|
||||
->error_messages("invalid", t("You must enter a valid email address"));
|
||||
->rules("required")
|
||||
->error_messages("required", t("You must enter a valid email address"));
|
||||
$group->textarea("text")
|
||||
->label(t("Message"))
|
||||
->label(t("Message (".module::get_var("ecard","max_length")." chars max)"))
|
||||
->id("g-text")
|
||||
->maxlength(module::get_var("ecard","max_length"))
|
||||
->rules("required")
|
||||
->error_messages("required", t("You must enter a message"));
|
||||
$group->hidden("item_id")->value($item->id);
|
||||
$group->checkbox("send_to_self")
|
||||
->label(t("Send yourself a copy"))
|
||||
->value(true)
|
||||
->checked(false);
|
||||
$group->checkbox("send_thumbnail")
|
||||
->label(t("Send thumbnail image, instead of resized image."))
|
||||
->value(true)
|
||||
->checked(false);
|
||||
if(module::get_var("ecard","send_plain") == true && module::is_active("watermark")) {
|
||||
$group->checkbox("send_fresh")
|
||||
->label(t("Send non-watermarked image."))
|
||||
->value(true)
|
||||
->checked(false);
|
||||
}
|
||||
$group->hidden("item_id")->value($item_id);
|
||||
module::event("ecard_send_form", $form);
|
||||
module::event("captcha_protect_form", $form);
|
||||
$group->submit("")->value(t("Send"))->class("ui-state-default ui-corner-all");
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -18,13 +18,35 @@
|
|||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class ecard_installer {
|
||||
private static function getversion() {
|
||||
return 11;
|
||||
}
|
||||
|
||||
private static function setversion() {
|
||||
module::set_version("ecard", self::getversion());
|
||||
}
|
||||
|
||||
static function install() {
|
||||
module::set_var("ecard","send_plain",false);
|
||||
module::set_var("ecard", "subject", "You have been sent an eCard");
|
||||
module::set_var("ecard", "message",
|
||||
"Hello %toname, \r\n%fromname has sent you an eCard. " .
|
||||
"Hello, \r\n%fromname has sent you an eCard. " .
|
||||
"Click the image to be taken to the gallery.");
|
||||
module::set_var("ecard", "bcc", "");
|
||||
module::set_var("ecard", "access_permissions", "everybody");
|
||||
module::set_version("ecard", 5);
|
||||
module::set_var("ecard","max_length",255);
|
||||
self::setversion();
|
||||
}
|
||||
|
||||
static function upgrade($version) {
|
||||
if($version <= 8) {
|
||||
module::set_var("ecard", "message",
|
||||
"Hello, \r\n%fromname has sent you an eCard. " .
|
||||
"Click the image to be taken to the gallery.");
|
||||
module::set_var("ecard","max_length",255);
|
||||
} else if($version == 9 || $version == 10) {
|
||||
module::set_var("ecard","send_plain",false);
|
||||
}
|
||||
self::setversion();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -19,6 +19,6 @@
|
|||
*/
|
||||
class ecard_theme_Core {
|
||||
static function head($theme) {
|
||||
$theme->css("ecard.css");
|
||||
return $theme->css("ecard.css");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
name = "E-Card"
|
||||
description = "Send a photo as a postcard"
|
||||
version = 5
|
||||
|
||||
version = 11
|
||||
|
|
|
|||
1
3.0/modules/ecard/views/ecard_form.html.php
Normal file
1
3.0/modules/ecard/views/ecard_form.html.php
Normal file
|
|
@ -0,0 +1 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.") ?>
<html>
<head>
<title>Send eCard</title>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript">
$(document).ready(function(){
$('textarea').keyup(function(){
var message = document.getElementById("g-text");
var max = parseInt($(message).attr('maxlength'));
if($(message).val().length > max){
$(message).val($(message).val().substr(0, $(message).attr('maxlength')));
}
$(document).find('.charsRemaining').html('Message (You have ' + (max - $(message).val().length) + ' characters remaining)');
});
});
</script>
</head>
<body>
<?= ecard::prefill_send_form(ecard::get_send_form($item_id)); ?>
</body>
</html>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
@ -25,7 +25,7 @@ class editcreation_theme_Core {
|
|||
}
|
||||
$item = $theme->item();
|
||||
if ( $item && access::can("edit", $item) ) {
|
||||
$theme->css("editcreation.css");
|
||||
return $theme->css("editcreation.css");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user