Merge remote-tracking branch 'gallery3-contrib/master'
This commit is contained in:
commit
00a96536e2
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
4
3.0/client/Python/pylibgal3/.gitignore
vendored
Normal file
4
3.0/client/Python/pylibgal3/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
*.pyc
|
||||||
|
test.py
|
||||||
|
MANIFEST
|
||||||
|
dist
|
12
3.0/client/Python/pylibgal3/KNOWN_ISSUES
Normal file
12
3.0/client/Python/pylibgal3/KNOWN_ISSUES
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
=========
|
||||||
|
pylibgal3
|
||||||
|
=========
|
||||||
|
* Need to implement member sorting
|
||||||
|
* Need to implement image resizing
|
||||||
|
* The getRandomImage() does not currently work
|
||||||
|
|
||||||
|
=========
|
||||||
|
Gallery 3
|
||||||
|
=========
|
||||||
|
* It appears that the 3.0 release of Gallery has a broken implementation
|
||||||
|
of the random image retrieval
|
674
3.0/client/Python/pylibgal3/LICENSE
Normal file
674
3.0/client/Python/pylibgal3/LICENSE
Normal file
@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
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 3 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, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
2
3.0/client/Python/pylibgal3/MANIFEST.in
Normal file
2
3.0/client/Python/pylibgal3/MANIFEST.in
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
include KNOWN_ISSUES
|
||||||
|
include LICENSE
|
21
3.0/client/Python/pylibgal3/README
Normal file
21
3.0/client/Python/pylibgal3/README
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
=======
|
||||||
|
Install
|
||||||
|
=======
|
||||||
|
|
||||||
|
To install this libary, just do the usual Python setup:
|
||||||
|
|
||||||
|
# tar -xvzf libgal3-*.tar.gz
|
||||||
|
# cd libgal3-*
|
||||||
|
# python setup.py install
|
||||||
|
|
||||||
|
That's it for install. You should be able to import the libg3 library after
|
||||||
|
that:
|
||||||
|
|
||||||
|
(In your python script)
|
||||||
|
import libg3
|
||||||
|
|
||||||
|
=============
|
||||||
|
Documentation
|
||||||
|
=============
|
||||||
|
|
||||||
|
See http://stuffivelearned.org/doku.php?id=programming:python:libgal3 for documentation info.
|
51
3.0/client/Python/pylibgal3/libg3/Errors.py
Normal file
51
3.0/client/Python/pylibgal3/libg3/Errors.py
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
#
|
||||||
|
# Author: Jay Deiman
|
||||||
|
# Email: admin@splitstreams.com
|
||||||
|
#
|
||||||
|
# This file is part of pylibgal3.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 pylibgal3. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
__all__ = ['G3Error' , 'G3RequestError' , 'G3InvalidRespError' ,
|
||||||
|
'G3UnknownTypeError' , 'G3AuthError' , 'G3UnknownError']
|
||||||
|
|
||||||
|
class G3Error(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class G3RequestError(G3Error):
|
||||||
|
def __init__(self , errDict):
|
||||||
|
self.errors = errDict
|
||||||
|
self._message = self._getMessage()
|
||||||
|
|
||||||
|
def _getMessage(self):
|
||||||
|
ret = ''
|
||||||
|
for e in self.errors.items():
|
||||||
|
ret += '%s: %r\n' % e
|
||||||
|
return ret
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self._message
|
||||||
|
|
||||||
|
class G3InvalidRespError(G3Error):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class G3UnknownTypeError(G3InvalidRespError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class G3AuthError(G3Error):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class G3UnknownError(G3Error):
|
||||||
|
pass
|
502
3.0/client/Python/pylibgal3/libg3/G3Items.py
Normal file
502
3.0/client/Python/pylibgal3/libg3/G3Items.py
Normal file
@ -0,0 +1,502 @@
|
|||||||
|
#
|
||||||
|
# Author: Jay Deiman
|
||||||
|
# Email: admin@splitstreams.com
|
||||||
|
#
|
||||||
|
# This file is part of pylibgal3.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 pylibgal3. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
__all__ = ['Album' , 'Image' , 'LocalImage' , 'RemoteImage' , 'LocalMovie' ,
|
||||||
|
'RemoteMovie' , 'getItemFromResp' , 'getItemsFromResp']
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
import json , weakref , types , os , mimetypes , re
|
||||||
|
|
||||||
|
class BaseRemote(object):
|
||||||
|
def __init__(self , respObj , weakGalObj , weakParent=None):
|
||||||
|
self._setAttrItems(respObj.items())
|
||||||
|
if 'entity' in respObj:
|
||||||
|
self._setAttrItems(respObj['entity'].items())
|
||||||
|
self._weakParent = None
|
||||||
|
if weakParent is not None:
|
||||||
|
self._weakParent = weakParent
|
||||||
|
self._weakGal = weakGalObj
|
||||||
|
self.fh = None
|
||||||
|
self._postInit()
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
try:
|
||||||
|
return self.title
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
def __getattr__(self , name):
|
||||||
|
"""
|
||||||
|
A bit of magic to make the retrieval of member objects lazy
|
||||||
|
"""
|
||||||
|
# Process the specials
|
||||||
|
if name == 'members':
|
||||||
|
self.members = self._getMemberObjects()
|
||||||
|
return self.members
|
||||||
|
if name == 'tags':
|
||||||
|
self.tags = self._getTags()
|
||||||
|
return self.tags
|
||||||
|
if name == 'comments':
|
||||||
|
self.comments = self._getComments()
|
||||||
|
return self.comments
|
||||||
|
# Process the weak reference calls
|
||||||
|
if name == '_gal':
|
||||||
|
return self._weakGal()
|
||||||
|
if name == 'parent' and self._weakParent is not None:
|
||||||
|
return self._weakParent()
|
||||||
|
# Process the generic items
|
||||||
|
urlAttr = '_%s' % name
|
||||||
|
# Call __getattribute__ to prevent loops
|
||||||
|
attr = object.__getattribute__(self , urlAttr)
|
||||||
|
if attr is not None and attr.startswith('http'):
|
||||||
|
obj = self._getUrlObject(attr)
|
||||||
|
setattr(self , name , obj)
|
||||||
|
return obj
|
||||||
|
raise AttributeError(name)
|
||||||
|
|
||||||
|
def _postInit(self):
|
||||||
|
"""
|
||||||
|
This can be overridden in subclasses to do any special initialization
|
||||||
|
at the end of the __init__ call
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
def _setAttrItems(self , d):
|
||||||
|
for k , v in d:
|
||||||
|
if k == 'entity':
|
||||||
|
# Skip it
|
||||||
|
continue
|
||||||
|
if (type(v) in types.StringTypes and v.startswith('http') and
|
||||||
|
'url' not in k) or k == 'members':
|
||||||
|
setattr(self , '_%s' % k , v)
|
||||||
|
else:
|
||||||
|
setattr(self , k , v)
|
||||||
|
|
||||||
|
def _getMemberObjects(self):
|
||||||
|
"""
|
||||||
|
This returns the appropriate objects for each child of this object.
|
||||||
|
The default "members" attribute only contains the URLs for the
|
||||||
|
children of this object. This returns a list of the actual objects.
|
||||||
|
"""
|
||||||
|
memObjs = self._gal.getItemsForUrls(self._members , self)
|
||||||
|
return memObjs
|
||||||
|
|
||||||
|
def _getTags(self):
|
||||||
|
"""
|
||||||
|
Returns the list of tag objects
|
||||||
|
|
||||||
|
returns(list[Tag])
|
||||||
|
"""
|
||||||
|
# First, I want just the actual tag itself, not the RESTy "tag_item",
|
||||||
|
# so I'm going to modify the urls to save a step
|
||||||
|
ret = []
|
||||||
|
urls = []
|
||||||
|
for url in self.relationships['tags']['members']:
|
||||||
|
m = re.match('^(.*?/tag)_item(/\d+),\d+$' , url)
|
||||||
|
urls.append('%s%s' % tuple(m.groups()))
|
||||||
|
if urls:
|
||||||
|
for url in urls:
|
||||||
|
resp = self._gal.getRespFromUrl(url)
|
||||||
|
ret.append(getItemFromResp(resp , self._gal , self))
|
||||||
|
return ret
|
||||||
|
|
||||||
|
def _getComments(self):
|
||||||
|
"""
|
||||||
|
Returns a list of the Comment items for this item
|
||||||
|
|
||||||
|
returns(list[Comment]) : Returns a list of Comment objects
|
||||||
|
"""
|
||||||
|
ret = []
|
||||||
|
# I can't use the shortcut I did for tags so I need to get the list
|
||||||
|
# of comments in the first call and then create the objects with
|
||||||
|
# the calls thereafter
|
||||||
|
commListUrl = self.relationships['comments']['url']
|
||||||
|
resp = self._gal.getRespFromUrl(commListUrl)
|
||||||
|
tmpObj = json.loads(resp.read())
|
||||||
|
for url in tmpObj['members']:
|
||||||
|
resp = self._gal.getRespFromUrl(url)
|
||||||
|
ret.append(getItemFromResp(resp , self._gal , self))
|
||||||
|
return ret
|
||||||
|
|
||||||
|
def _getUrlObject(self , url):
|
||||||
|
"""
|
||||||
|
This returns the album cover image
|
||||||
|
"""
|
||||||
|
resp = self._gal.getRespFromUrl(url)
|
||||||
|
return getItemFromResp(resp , self._gal , self)
|
||||||
|
|
||||||
|
def getCrDT(self):
|
||||||
|
"""
|
||||||
|
Returns a datetime object for the time this item was created
|
||||||
|
"""
|
||||||
|
if hasattr(self , 'created'):
|
||||||
|
return datetime.fromtimestamp(int(self.created))
|
||||||
|
return None
|
||||||
|
|
||||||
|
def getUpdDT(self):
|
||||||
|
"""
|
||||||
|
Returns a datetime object for the time this item was last updated
|
||||||
|
"""
|
||||||
|
if hasattr(self , 'updated'):
|
||||||
|
return datetime.fromtimestamp(int(self.updated))
|
||||||
|
return None
|
||||||
|
|
||||||
|
def delete(self):
|
||||||
|
"""
|
||||||
|
Deletes this
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
return self._gal.deleteItem(self)
|
||||||
|
|
||||||
|
def update(self , title=None , description=None):
|
||||||
|
"""
|
||||||
|
Update either the title, the description or both
|
||||||
|
|
||||||
|
title(str) : The new item title
|
||||||
|
description(str) : The new item description
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
if title is not None:
|
||||||
|
self.title = title
|
||||||
|
if description is not None:
|
||||||
|
self.description = description
|
||||||
|
return self._gal.updateItem(self)
|
||||||
|
|
||||||
|
def tag(self , tagName):
|
||||||
|
"""
|
||||||
|
Tag this item with the string "tagName"
|
||||||
|
|
||||||
|
tagName(str) : The actual tag name
|
||||||
|
|
||||||
|
returns(Tag) : The tag that was created
|
||||||
|
"""
|
||||||
|
return self._gal.tagItem(self , tagName)
|
||||||
|
|
||||||
|
class Album(BaseRemote):
|
||||||
|
def addImage(self , image , title='' , description='' , name=''):
|
||||||
|
"""
|
||||||
|
Add a LocalImage object to the album
|
||||||
|
|
||||||
|
image(LocalImage) : The image to upload
|
||||||
|
|
||||||
|
returns(RemoteImage) : The RemoteImage object that was created
|
||||||
|
"""
|
||||||
|
if not isinstance(image , LocalImage):
|
||||||
|
raise TypeError('%r is not of type LocalImage' % image)
|
||||||
|
return self._gal.addImage(self , image , title , description , name)
|
||||||
|
|
||||||
|
def addMovie(self , movie , name='' , title='' , description=''):
|
||||||
|
"""
|
||||||
|
Adds a LocalMovie object to the album
|
||||||
|
|
||||||
|
movie(LocalMovie) : The movie to upload
|
||||||
|
|
||||||
|
returns(RemoteMovie) : The RemoteMovie object that was created
|
||||||
|
"""
|
||||||
|
return self._gal.addMovie(self , movie , title , description , name)
|
||||||
|
|
||||||
|
def addAlbum(self , albumName , title , description=''):
|
||||||
|
"""
|
||||||
|
Add a subalbum to this album
|
||||||
|
|
||||||
|
albumName(str) : The name of the new album
|
||||||
|
title(str) : The album title
|
||||||
|
description(str): The album description
|
||||||
|
|
||||||
|
returns(Album) : The Album object that was created
|
||||||
|
"""
|
||||||
|
return self._gal.addAlbum(self , albumName , title , description)
|
||||||
|
|
||||||
|
def setCover(self , image):
|
||||||
|
"""
|
||||||
|
Sets the album cover to the RemoteImage
|
||||||
|
|
||||||
|
image(RemoteImage) : The image to set as the album cover
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
return self._gal.setAlbumCover(self , image)
|
||||||
|
|
||||||
|
def getAlbums(self):
|
||||||
|
"""
|
||||||
|
Return a list of the sub-albums in this album
|
||||||
|
|
||||||
|
returns(list[Album]) : A list of Album objects
|
||||||
|
"""
|
||||||
|
return self._getByType('album')
|
||||||
|
Albums = property(getAlbums)
|
||||||
|
|
||||||
|
def getImages(self):
|
||||||
|
"""
|
||||||
|
Return a list of the images in this album
|
||||||
|
|
||||||
|
returns(list[RemoteImage]) : A list of RemoteImages
|
||||||
|
"""
|
||||||
|
return self._getByType('photo')
|
||||||
|
Images = property(getImages)
|
||||||
|
|
||||||
|
def getMovies(self):
|
||||||
|
"""
|
||||||
|
Return a list of the movies in this album
|
||||||
|
|
||||||
|
returns(list[RemoteMovie]) : A list of RemoteMovie objects
|
||||||
|
"""
|
||||||
|
return self._getByType('movie')
|
||||||
|
Movies = property(getMovies)
|
||||||
|
|
||||||
|
def getRandomImage(self , direct=True):
|
||||||
|
"""
|
||||||
|
Returns a random RemoteImage object for the album. If "direct" is
|
||||||
|
False, a random image can be pulled from nested albums.
|
||||||
|
|
||||||
|
direct(bool) : If set to False, the image may be pulled from
|
||||||
|
a sub-album
|
||||||
|
|
||||||
|
returns(RemoteImage) : Returns a RemoteImage instance
|
||||||
|
"""
|
||||||
|
return self._gal.getRandomImage(self , direct)
|
||||||
|
|
||||||
|
def _getByType(self , t):
|
||||||
|
ret = []
|
||||||
|
for m in self.members:
|
||||||
|
if m.type == t:
|
||||||
|
ret.append(m)
|
||||||
|
return ret
|
||||||
|
|
||||||
|
class Image(object):
|
||||||
|
contentType = ''
|
||||||
|
|
||||||
|
class LocalImage(Image):
|
||||||
|
def __init__(self , path , replaceSpaces=True):
|
||||||
|
if not os.path.isfile(path):
|
||||||
|
raise IOError('%s is not a file' % path)
|
||||||
|
self.path = path
|
||||||
|
self.replaceSpaces = replaceSpaces
|
||||||
|
self.Filename = os.path.basename(self.path)
|
||||||
|
self.fh = None
|
||||||
|
self.type = 'photo'
|
||||||
|
|
||||||
|
def setContentType(self , ctype=None):
|
||||||
|
if ctype is not None:
|
||||||
|
self.contentType = ctype
|
||||||
|
self.contentType = mimetypes.guess_type(self.getFileContents())[0] or \
|
||||||
|
'application/octet-stream'
|
||||||
|
def getContentType(self):
|
||||||
|
if not self.contentType:
|
||||||
|
self.setContentType()
|
||||||
|
return self.contentType
|
||||||
|
ContentType = property(getContentType , setContentType)
|
||||||
|
|
||||||
|
def setFilename(self , name):
|
||||||
|
self.filename = name
|
||||||
|
if self.replaceSpaces:
|
||||||
|
self.filename = self.filename.replace(' ' , '_')
|
||||||
|
def getFilename(self):
|
||||||
|
return self.filename
|
||||||
|
Filename = property(getFilename , setFilename)
|
||||||
|
|
||||||
|
def getFileContents(self):
|
||||||
|
"""
|
||||||
|
Gets the entire contents of the file
|
||||||
|
|
||||||
|
returns(str) : File contents
|
||||||
|
"""
|
||||||
|
if self.fh is None:
|
||||||
|
self.fh = open(self.path , 'rb')
|
||||||
|
self.fh.seek(0)
|
||||||
|
return self.fh.read()
|
||||||
|
|
||||||
|
def getUploadContent(self):
|
||||||
|
"""
|
||||||
|
This will return a string containing the MIME headers and the actual
|
||||||
|
binary content to be uploaded
|
||||||
|
"""
|
||||||
|
ret = 'Content-Disposition: form-data; name="file"; '
|
||||||
|
ret += 'filename="%s"\r\n' % self.filename
|
||||||
|
ret += 'Content-Type: %s\r\n' % self.ContentType
|
||||||
|
ret += 'Content-Transfer-Encoding: binary\r\n'
|
||||||
|
ret += '\r\n'
|
||||||
|
ret += self.getFileContents() + '\r\n'
|
||||||
|
return ret
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
try:
|
||||||
|
self.fh.close()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
class RemoteImage(BaseRemote , Image):
|
||||||
|
def addComment(self , comment):
|
||||||
|
"""
|
||||||
|
Comment on this item with the string "comment"
|
||||||
|
|
||||||
|
comment(str) : The comment
|
||||||
|
|
||||||
|
returns(Comment) : The comment that was created
|
||||||
|
"""
|
||||||
|
return self._gal.addComment(self , comment)
|
||||||
|
|
||||||
|
def read(self , length=None):
|
||||||
|
if not self.fh:
|
||||||
|
resp = self._gal.getRespFromUrl(self.file_url)
|
||||||
|
self.fh = resp
|
||||||
|
if length is None:
|
||||||
|
return self.fh.read()
|
||||||
|
return self.fh.read(int(length))
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
try:
|
||||||
|
self.fh.close()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def getResizeHandle(self):
|
||||||
|
"""
|
||||||
|
Returns a file-like object (specifically a urllib2.addinfourl) handle
|
||||||
|
to the "resize" version of the image
|
||||||
|
|
||||||
|
returns(urllib2.addinfourl) : A file-like object handle for retrieving
|
||||||
|
the resized image
|
||||||
|
"""
|
||||||
|
if hasattr(self , 'resize_url'):
|
||||||
|
resp = self._gal.getRespFromUrl(self.resize_url)
|
||||||
|
return resp
|
||||||
|
return None
|
||||||
|
|
||||||
|
def getThumbHandle(self):
|
||||||
|
"""
|
||||||
|
Returns a file-like object (specifically a urllib2.addinfourl) handle
|
||||||
|
to the "thumbnail" version of the image
|
||||||
|
|
||||||
|
returns(urllib2.addinfourl) : A file-like object handle for retrieving
|
||||||
|
the thumbnail image
|
||||||
|
"""
|
||||||
|
if hasattr(self , 'thumb_url'):
|
||||||
|
resp = self._gal.getRespFromUrl(self.thumb_url)
|
||||||
|
return resp
|
||||||
|
return None
|
||||||
|
|
||||||
|
class LocalMovie(LocalImage):
|
||||||
|
def __init__(self , path , replaceSpaces=True):
|
||||||
|
LocalImage.__init__(self , path , replaceSpaces)
|
||||||
|
self.type = 'movie'
|
||||||
|
|
||||||
|
class RemoteMovie(RemoteImage):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class Tag(BaseRemote):
|
||||||
|
"""
|
||||||
|
A simple class to represent a tag
|
||||||
|
"""
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
def _postInit(self):
|
||||||
|
if hasattr(self , 'count'):
|
||||||
|
self.count = int(self.count)
|
||||||
|
self.type = 'tag'
|
||||||
|
|
||||||
|
def tag(self , tagName):
|
||||||
|
raise G3Error('You cannot tag a tag')
|
||||||
|
|
||||||
|
class Comment(BaseRemote):
|
||||||
|
"""
|
||||||
|
A class to represent a comment
|
||||||
|
"""
|
||||||
|
def __str__(self):
|
||||||
|
return self.text
|
||||||
|
|
||||||
|
def _postInit(self):
|
||||||
|
# Change the "item" attribute to "parent" since that's what it is
|
||||||
|
# I'm doing this to address overall consistency
|
||||||
|
self._parent = None
|
||||||
|
if hasattr(self , '_item'):
|
||||||
|
self._parent = getattr(self , '_item')
|
||||||
|
|
||||||
|
def tag(self , tagName):
|
||||||
|
raise G3Error('You cannot tag a comment')
|
||||||
|
|
||||||
|
def getItemFromResp(response , galObj , parent=None):
|
||||||
|
"""
|
||||||
|
Returns the appropriate item given the "addinfourl" response object from
|
||||||
|
the urllib2 request
|
||||||
|
|
||||||
|
response(addinfourl|dict) : The response object from the urllib2 request
|
||||||
|
or a dict that has already been converted
|
||||||
|
(usually when called from getItemsFromResp)
|
||||||
|
galObj(Gallery3) : The gallery object this is associated with
|
||||||
|
parent(Album) : The parent object for this item
|
||||||
|
|
||||||
|
returns(BaseRemote) : Returns an implemenation of BaseRemote
|
||||||
|
"""
|
||||||
|
galObj = weakref.ref(galObj)
|
||||||
|
if parent is not None:
|
||||||
|
parent = weakref.ref(parent)
|
||||||
|
if isinstance(response , dict):
|
||||||
|
respObj = response
|
||||||
|
else:
|
||||||
|
respObj = json.loads(response.read())
|
||||||
|
if 'count' in respObj['entity']:
|
||||||
|
# This is a tag. It doesn't have the same items as regular objects
|
||||||
|
return Tag(respObj , galObj , parent)
|
||||||
|
if 'text' in respObj['entity']:
|
||||||
|
# This is a comment. It also does not have the same items as
|
||||||
|
# regular objects
|
||||||
|
return Comment(respObj , galObj , parent)
|
||||||
|
try:
|
||||||
|
t = respObj['entity']['type']
|
||||||
|
except:
|
||||||
|
raise G3InvalidRespError('Response contains no "entity type": %r' %
|
||||||
|
response)
|
||||||
|
if t == 'album':
|
||||||
|
return Album(respObj , galObj , parent)
|
||||||
|
elif t == 'photo':
|
||||||
|
return RemoteImage(respObj , galObj , parent)
|
||||||
|
elif t == 'movie':
|
||||||
|
return RemoteMovie(respObj , galObj , parent)
|
||||||
|
else:
|
||||||
|
raise G3UnknownTypeError('Unknown entity type: %s' % t)
|
||||||
|
|
||||||
|
def getItemsFromResp(response , galObj , parent=None):
|
||||||
|
"""
|
||||||
|
This takes the raw response with a list of items and returns a list of
|
||||||
|
the corresponding objects
|
||||||
|
|
||||||
|
response(addinfourl|dict) : The response object from the urllib2 request
|
||||||
|
or a dict that has already been converted
|
||||||
|
(usually when called from getItemsFromResp)
|
||||||
|
galObj(Gallery3) : The gallery object this is associated with
|
||||||
|
parent(Album) : The parent object for this item
|
||||||
|
|
||||||
|
returns(list[BaseRemote]) : Returns a list of BaseRemote objects
|
||||||
|
"""
|
||||||
|
ret = []
|
||||||
|
lResp = json.loads(response.read())
|
||||||
|
if not isinstance(lResp , list):
|
||||||
|
lResp = list(lResp)
|
||||||
|
for resp in lResp:
|
||||||
|
ret.append(getItemFromResp(resp , galObj , parent))
|
||||||
|
return ret
|
464
3.0/client/Python/pylibgal3/libg3/Gallery3.py
Normal file
464
3.0/client/Python/pylibgal3/libg3/Gallery3.py
Normal file
@ -0,0 +1,464 @@
|
|||||||
|
#
|
||||||
|
# Author: Jay Deiman
|
||||||
|
# Email: admin@splitstreams.com
|
||||||
|
#
|
||||||
|
# This file is part of pylibgal3.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 pylibgal3. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
__all__ = ['Gallery3' , 'login']
|
||||||
|
|
||||||
|
from Requests import *
|
||||||
|
from Errors import G3RequestError , G3UnknownError
|
||||||
|
from G3Items import getItemFromResp , getItemsFromResp , BaseRemote , Album , \
|
||||||
|
RemoteImage , Tag
|
||||||
|
from urllib import quote , urlencode
|
||||||
|
from uuid import uuid4
|
||||||
|
import urllib2 , os , json
|
||||||
|
|
||||||
|
class Gallery3(object):
|
||||||
|
"""
|
||||||
|
This is the main utility class that should be instantiated and used for all
|
||||||
|
calls
|
||||||
|
"""
|
||||||
|
def __init__(self , host , apiKey , g3Base='/gallery3' , port=80 ,
|
||||||
|
ssl=False):
|
||||||
|
"""
|
||||||
|
Initializes and sets up the gallery 3 object
|
||||||
|
|
||||||
|
host(str) : The hostname of the gallery site
|
||||||
|
apiKey(str) : The api key to use for the connections
|
||||||
|
g3Base(str) : The remote url path to your gallery 3 install
|
||||||
|
(default: /gallery3)
|
||||||
|
port(int) : The port number to connect to (default: 80)
|
||||||
|
ssl(bool) : If true, use SSL for the connection (default: 80)
|
||||||
|
"""
|
||||||
|
self.host = host
|
||||||
|
self.apiKey = apiKey
|
||||||
|
self.port = int(port)
|
||||||
|
self.ssl = ssl
|
||||||
|
self.g3Base = g3Base.strip('/')
|
||||||
|
self.protocol = ('http' , 'https')[ssl]
|
||||||
|
self.root = None
|
||||||
|
self._rootUri = 'index.php/rest/item/1'
|
||||||
|
self._opener = None
|
||||||
|
self._buildOpener()
|
||||||
|
|
||||||
|
def getRoot(self):
|
||||||
|
"""
|
||||||
|
Returns the root item (album)
|
||||||
|
"""
|
||||||
|
if self.root is None:
|
||||||
|
resp = self.getRespFromUri(self._rootUri)
|
||||||
|
self.root = getItemFromResp(resp , self)
|
||||||
|
return self.root
|
||||||
|
|
||||||
|
def getRandomImage(self , album , direct=True):
|
||||||
|
"""
|
||||||
|
Returns a random RemoteImage object for the album. If "direct" is
|
||||||
|
False, a random image can be pulled from nested albums.
|
||||||
|
|
||||||
|
album(Album) : The album object to pull the random image from
|
||||||
|
direct(bool) : If set to False, the image may be pulled from
|
||||||
|
a sub-album
|
||||||
|
|
||||||
|
returns(RemoteImage) : Returns a RemoteImage instance
|
||||||
|
"""
|
||||||
|
scope = ('all' , 'direct')[direct]
|
||||||
|
data = {
|
||||||
|
'type': 'photo' ,
|
||||||
|
'random': 'true' ,
|
||||||
|
'scope': scope ,
|
||||||
|
}
|
||||||
|
url = '%s?%s' % (album.url , urlencode(data))
|
||||||
|
resp = self.getRespFromUrl(url)
|
||||||
|
return getItemFromResp(resp , self)
|
||||||
|
|
||||||
|
def getItemsForUrls(self , urls , parent=None):
|
||||||
|
"""
|
||||||
|
This retrieves an item for each url specified in the urls list
|
||||||
|
|
||||||
|
urls(list[str]) : The list of urls to retrieve
|
||||||
|
|
||||||
|
returns(list[BaseRemote]) : Returns a list of the corresponding
|
||||||
|
remote objects
|
||||||
|
"""
|
||||||
|
numUrls = len(urls)
|
||||||
|
start = 0
|
||||||
|
increment = 25
|
||||||
|
ret = []
|
||||||
|
while start < numUrls:
|
||||||
|
data = {
|
||||||
|
'urls': json.dumps(urls[start:start+increment]) ,
|
||||||
|
'num': str(increment) ,
|
||||||
|
'start': str(start) ,
|
||||||
|
}
|
||||||
|
resp = self.getRespFromUri('index.php/rest/items' , data)
|
||||||
|
ret.extend(getItemsFromResp(resp , self , parent))
|
||||||
|
start += increment
|
||||||
|
return ret
|
||||||
|
|
||||||
|
def getRespFromUrl(self , url):
|
||||||
|
"""
|
||||||
|
This returns the response object given a full url rather than just a
|
||||||
|
uri defining the location on the server
|
||||||
|
|
||||||
|
url(str) : The url to the resource
|
||||||
|
"""
|
||||||
|
req = GetRequest(url , self.apiKey)
|
||||||
|
resp = self._openReq(req)
|
||||||
|
return resp
|
||||||
|
|
||||||
|
def getRespFromUri(self , uri , kwargs={}):
|
||||||
|
"""
|
||||||
|
Performs the request for the given uri and returns the "addinfourl"
|
||||||
|
response
|
||||||
|
|
||||||
|
uri(str) : The uri string defining the resource on the defined host
|
||||||
|
"""
|
||||||
|
url = self._buildUrl(uri , kwargs)
|
||||||
|
print url
|
||||||
|
return self.getRespFromUrl(url)
|
||||||
|
|
||||||
|
def addAlbum(self , parent , albumName , title , description=''):
|
||||||
|
"""
|
||||||
|
Adds an album to the given parent album
|
||||||
|
|
||||||
|
parent(Album) : The parent Album object
|
||||||
|
albumName(str) : The name of the album
|
||||||
|
title(str) : The album title
|
||||||
|
description(str) : The album description
|
||||||
|
|
||||||
|
returns(Album) : The Album object that was created
|
||||||
|
"""
|
||||||
|
if not parent.can_edit:
|
||||||
|
raise G3AuthError('You do not have permission to edit: %s' %
|
||||||
|
parent.title)
|
||||||
|
data = {
|
||||||
|
'type': 'album' ,
|
||||||
|
'name': albumName ,
|
||||||
|
'title': title ,
|
||||||
|
'description': description ,
|
||||||
|
}
|
||||||
|
req = PostRequest(parent.url , self.apiKey , data)
|
||||||
|
resp = self._openReq(req)
|
||||||
|
newObjUrl = self._getUrlFromResp(resp)
|
||||||
|
item = getItemFromResp(self.getRespFromUrl(newObjUrl) , self , parent)
|
||||||
|
parent._members.append(newObjUrl)
|
||||||
|
parent.members.append(item)
|
||||||
|
return item
|
||||||
|
|
||||||
|
def addImage(self , parent , image , title='' , description='' , name=''):
|
||||||
|
"""
|
||||||
|
Add a LocalImage to the parent album.
|
||||||
|
|
||||||
|
parent(Album) : The parent album to add the image to
|
||||||
|
image(LocalImage) : The local image to upload and add to the
|
||||||
|
parent
|
||||||
|
title(str) : The image title
|
||||||
|
description(str) : The image description
|
||||||
|
name(str) : The image file name
|
||||||
|
|
||||||
|
returns(RemoteImage) : The RemoteImage instance for the item
|
||||||
|
uploaded
|
||||||
|
"""
|
||||||
|
if not parent.can_edit:
|
||||||
|
raise G3AuthError('You do not have permission to edit: %s' %
|
||||||
|
parent.title)
|
||||||
|
if name:
|
||||||
|
image.Filename = name
|
||||||
|
entity = {
|
||||||
|
'name': image.filename ,
|
||||||
|
'type': image.type ,
|
||||||
|
'title': title ,
|
||||||
|
'description': description ,
|
||||||
|
}
|
||||||
|
boundary = str(uuid4())
|
||||||
|
headers = {'Content-Type': 'multipart/form-data; boundary=%s' %
|
||||||
|
boundary}
|
||||||
|
# this is more complicated than adding an album. We have to
|
||||||
|
# construct the upload MIME headers, including build the string
|
||||||
|
# data section
|
||||||
|
data = '--%s\r\n' % boundary
|
||||||
|
data += 'Content-Disposition: form-data; name="entity"\r\n'
|
||||||
|
data += 'Content-Type: text/plain; ' \
|
||||||
|
'charset=UTF-8\r\n'
|
||||||
|
data += 'Content-Transfer-Encoding: 8bit\r\n'
|
||||||
|
data += '\r\n'
|
||||||
|
data += '%s\r\n' % json.dumps(entity , separators=(',' , ':'))
|
||||||
|
data += '--%s\r\n' % boundary
|
||||||
|
data += image.getUploadContent()
|
||||||
|
data += '--%s--\r\n' % boundary
|
||||||
|
req = PostRequest(parent.url , self.apiKey , data , headers)
|
||||||
|
resp = self._openReq(req)
|
||||||
|
newObjUrl = self._getUrlFromResp(resp)
|
||||||
|
item = getItemFromResp(self.getRespFromUrl(newObjUrl) , self , parent)
|
||||||
|
parent._members.append(newObjUrl)
|
||||||
|
parent.members.append(item)
|
||||||
|
return item
|
||||||
|
|
||||||
|
def addMovie(self , parent , movie , title='' , description='' , name=''):
|
||||||
|
"""
|
||||||
|
Add a LocalMovie to the parent album.
|
||||||
|
|
||||||
|
parent(Album) : The parent album to add the movie to
|
||||||
|
image(LocalMovie) : The local movie to upload and add to the
|
||||||
|
parent
|
||||||
|
title(str) : The movie title
|
||||||
|
description(str) : The movie description
|
||||||
|
name(str) : The movie file name
|
||||||
|
|
||||||
|
returns(RemoteMovie) : The RemoteMovie instance for the movie
|
||||||
|
uploaded
|
||||||
|
"""
|
||||||
|
return self.addImage(parent , movie , title , description , name)
|
||||||
|
|
||||||
|
def setAlbumCover(self , album , image):
|
||||||
|
"""
|
||||||
|
Updates a remote item's title and description
|
||||||
|
|
||||||
|
album(Album) : The album to set the cover on
|
||||||
|
image(RemoteImage) : The image to use as the cover
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
if not album.can_edit:
|
||||||
|
raise G3AuthError('You do not have permission to edit: %s' %
|
||||||
|
album.title)
|
||||||
|
try:
|
||||||
|
self._isItemValid(album , Album)
|
||||||
|
self._isItemValid(image , RemoteImage)
|
||||||
|
except Exception , e:
|
||||||
|
return (False , str(e))
|
||||||
|
data = {
|
||||||
|
'album_cover': image.url ,
|
||||||
|
}
|
||||||
|
req = PutRequest(album.url , self.apiKey , data)
|
||||||
|
try:
|
||||||
|
resp = self._openReq(req)
|
||||||
|
except G3RequestError , e:
|
||||||
|
return (False , str(e))
|
||||||
|
album.album_cover = image
|
||||||
|
album._album_cover = image.url
|
||||||
|
return (True , '')
|
||||||
|
|
||||||
|
def updateItem(self , item):
|
||||||
|
"""
|
||||||
|
Updates a remote item's title and description
|
||||||
|
|
||||||
|
item(BaseRemote) : An item descended from BaseRemote
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
if not item.can_edit:
|
||||||
|
raise G3AuthError('You do not have permission to edit: %s' %
|
||||||
|
item.title)
|
||||||
|
try:
|
||||||
|
self._isItemValid(item , BaseRemote)
|
||||||
|
except Exception , e:
|
||||||
|
return (False , str(e))
|
||||||
|
data = {
|
||||||
|
'title': item.title ,
|
||||||
|
'description': item.description ,
|
||||||
|
}
|
||||||
|
req = PutRequest(item.url , self.apiKey , data)
|
||||||
|
try:
|
||||||
|
resp = self._openReq(req)
|
||||||
|
except G3RequestError , e:
|
||||||
|
return (False , str(e))
|
||||||
|
return (True , '')
|
||||||
|
|
||||||
|
def updateAlbum(self , album):
|
||||||
|
"""
|
||||||
|
Update the title and description for an album.
|
||||||
|
|
||||||
|
image(Album) : Updates the title and/or description
|
||||||
|
for the Album
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
return self.updateItem(album)
|
||||||
|
|
||||||
|
def updateImage(self , image):
|
||||||
|
"""
|
||||||
|
Update the title and description for an image.
|
||||||
|
|
||||||
|
image(RemoteImage) : Updates the title and/or description for the
|
||||||
|
RemoteImage
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
return self.updateItem(image)
|
||||||
|
|
||||||
|
def updateMovie(self , movie):
|
||||||
|
"""
|
||||||
|
Update the title and description for a movie.
|
||||||
|
|
||||||
|
image(RemoteMovie) : Updates the title and/or description for the
|
||||||
|
RemoteMovie
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
return self.updateItem(movie)
|
||||||
|
|
||||||
|
def deleteItem(self , item):
|
||||||
|
"""
|
||||||
|
Deletes the given item. Item must be descended from BaseRemote.
|
||||||
|
|
||||||
|
item(BaseRemote) : The item to delete
|
||||||
|
|
||||||
|
returns(tuple(status , msg)) : Returns a tuple of a boolean status
|
||||||
|
and a message if there is an error
|
||||||
|
"""
|
||||||
|
if not item.can_edit:
|
||||||
|
raise G3AuthError('You do not have permission to edit: %s' %
|
||||||
|
item.title)
|
||||||
|
try:
|
||||||
|
self._isItemValid(item , BaseRemote)
|
||||||
|
except Exception , e:
|
||||||
|
return (False , e.message)
|
||||||
|
req = DeleteRequest(item.url , self.apiKey)
|
||||||
|
try:
|
||||||
|
resp = self._openReq(req)
|
||||||
|
except G3RequestError , e:
|
||||||
|
return (False , e.message)
|
||||||
|
return (True , '')
|
||||||
|
|
||||||
|
def tagItem(self , item , tagName):
|
||||||
|
"""
|
||||||
|
Tag this item with the string "tagName"
|
||||||
|
|
||||||
|
tagName(str) : The actual tag name
|
||||||
|
|
||||||
|
returns(Tag) : The tag that was created
|
||||||
|
"""
|
||||||
|
# First we have to create the tag itself, if necessary
|
||||||
|
data = {
|
||||||
|
'name': str(tagName) ,
|
||||||
|
}
|
||||||
|
url = self._buildUrl('index.php/rest/tags')
|
||||||
|
req = PostRequest(url , self.apiKey , data)
|
||||||
|
resp = self._openReq(req)
|
||||||
|
r = json.loads(resp.read())
|
||||||
|
tagUrl = r['url']
|
||||||
|
# And now that we have our (possibly) newly created tag, we can
|
||||||
|
# use that to tag our item
|
||||||
|
data = {
|
||||||
|
'tag': tagUrl ,
|
||||||
|
'item': item.url ,
|
||||||
|
}
|
||||||
|
url = self._buildUrl('index.php/rest/item_tags/%s' % item.id)
|
||||||
|
req = PostRequest(url , self.apiKey , data)
|
||||||
|
resp = self._openReq(req)
|
||||||
|
respObj = json.loads(resp.read())
|
||||||
|
item.relationships['tags']['members'].append(respObj['url'])
|
||||||
|
tag = Tag(respObj , self , item)
|
||||||
|
if hasattr(item , 'tags'):
|
||||||
|
item.tags.append(tag)
|
||||||
|
return tag
|
||||||
|
|
||||||
|
def addComment(self , image , comment):
|
||||||
|
"""
|
||||||
|
Comment on this item with the string "comment"
|
||||||
|
|
||||||
|
comment(str) : The comment
|
||||||
|
|
||||||
|
returns(Comment) : The comment that was created
|
||||||
|
"""
|
||||||
|
data = {
|
||||||
|
'item': image.url ,
|
||||||
|
'text': comment ,
|
||||||
|
}
|
||||||
|
url = self._buildUrl('index.php/rest/comments')
|
||||||
|
req = PostRequest(url , self.apiKey , data)
|
||||||
|
resp = self._openReq(req)
|
||||||
|
commUrl = json.loads(resp.read())['url']
|
||||||
|
resp = self.getRespFromUrl(commUrl)
|
||||||
|
comm = getItemFromResp(resp , self , image)
|
||||||
|
if hasattr(image , 'comments'):
|
||||||
|
image.comments.append(comm)
|
||||||
|
return comm
|
||||||
|
|
||||||
|
def _buildOpener(self):
|
||||||
|
cp = urllib2.HTTPCookieProcessor()
|
||||||
|
self._opener = urllib2.build_opener(cp)
|
||||||
|
if self.ssl:
|
||||||
|
self._opener.add_handler(urllib2.HTTPSHandler())
|
||||||
|
|
||||||
|
def _buildUrl(self , resource , kwargs={}):
|
||||||
|
url = '%s://%s:%d/%s/%s' % (self.protocol , self.host , self.port ,
|
||||||
|
quote(self.g3Base) , quote(resource))
|
||||||
|
if kwargs:
|
||||||
|
url += '?%s' % urlencode(kwargs)
|
||||||
|
return url
|
||||||
|
|
||||||
|
def _getUrlFromResp(self , resp):
|
||||||
|
d = json.loads(resp.read())
|
||||||
|
return d['url']
|
||||||
|
|
||||||
|
def _openReq(self , req):
|
||||||
|
try:
|
||||||
|
resp = self._opener.open(req)
|
||||||
|
except urllib2.HTTPError , e:
|
||||||
|
err = json.loads(e.read())
|
||||||
|
if isinstance(err , dict) and 'errors' in err:
|
||||||
|
raise G3RequestError(err['errors'])
|
||||||
|
else:
|
||||||
|
raise G3UnknownError('Unknown request error: %s' % e)
|
||||||
|
return resp
|
||||||
|
|
||||||
|
def _isItemValid(self , item , cls):
|
||||||
|
if not isinstance(item , cls):
|
||||||
|
raise TypeError('Items to be modified must be descended from '
|
||||||
|
'%s: %s' % (cls , type(item)))
|
||||||
|
if not 'url' in item.__dict__:
|
||||||
|
raise G3UnknownError('The object, %s, has no "url"' % item)
|
||||||
|
|
||||||
|
def login(host , username , passwd , g3Base='/gallery3' , port=80 ,
|
||||||
|
ssl=False):
|
||||||
|
"""
|
||||||
|
This will log you in and return a Gallery3 object on success, None
|
||||||
|
otherwise
|
||||||
|
|
||||||
|
host(str) : The hostname of the gallery site
|
||||||
|
username(str) : The username to login with
|
||||||
|
passwd(str) : The password to login with
|
||||||
|
g3Base(str) : The remote url path to your gallery 3 install
|
||||||
|
(default: /gallery3)
|
||||||
|
port(int) : The port number to connect to (default: 80)
|
||||||
|
ssl(bool) : If true, use SSL for the connection (default: 80)
|
||||||
|
"""
|
||||||
|
data = {
|
||||||
|
'user': username ,
|
||||||
|
'password': passwd ,
|
||||||
|
}
|
||||||
|
protocol = ('http' , 'https')[ssl]
|
||||||
|
url = '%s://%s:%d/%s/index.php/rest' % (protocol , host , port ,
|
||||||
|
quote(g3Base))
|
||||||
|
req = PostRequest(url , None , urlencode(data))
|
||||||
|
opener = urllib2.build_opener()
|
||||||
|
if ssl:
|
||||||
|
opener.add_handler(urllib2.HTTPSHandler())
|
||||||
|
try:
|
||||||
|
resp = opener.open(req)
|
||||||
|
except urllib2.HTTPError , e:
|
||||||
|
return None
|
||||||
|
apiKey = resp.read().strip('\'"')
|
||||||
|
return Gallery3(host , apiKey , g3Base , port , ssl)
|
72
3.0/client/Python/pylibgal3/libg3/Requests.py
Normal file
72
3.0/client/Python/pylibgal3/libg3/Requests.py
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
#
|
||||||
|
# Author: Jay Deiman
|
||||||
|
# Email: admin@splitstreams.com
|
||||||
|
#
|
||||||
|
# This file is part of pylibgal3.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 pylibgal3. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
__all__ = ['BaseRequest' , 'GetRequest' , 'PostRequest' , 'PutRequest' ,
|
||||||
|
'DeleteRequest']
|
||||||
|
|
||||||
|
from urllib2 import Request
|
||||||
|
from urllib import quote
|
||||||
|
import os , json , types
|
||||||
|
|
||||||
|
class BaseRequest(Request):
|
||||||
|
def __init__(self , url , apiKey , data=None , headers={} ,
|
||||||
|
origin_req_host=None , unverifiable=False):
|
||||||
|
if apiKey is not None:
|
||||||
|
headers['X-Gallery-Request-Key'] = apiKey
|
||||||
|
if data is not None:
|
||||||
|
if isinstance(data , dict):
|
||||||
|
data = 'entity=%s' % quote(json.dumps(data ,
|
||||||
|
separators=(',' , ':')))
|
||||||
|
elif type(data) not in types.StringTypes:
|
||||||
|
raise TypeError('Invalid type for data. It should be '
|
||||||
|
'a "dict" or "str", not %s' % type(data))
|
||||||
|
headers['Content-Length'] = str(len(data))
|
||||||
|
Request.__init__(self , url , data , headers , origin_req_host ,
|
||||||
|
unverifiable)
|
||||||
|
|
||||||
|
class GetRequest(BaseRequest):
|
||||||
|
def __init__(self , url , apiKey , data=None , headers={} ,
|
||||||
|
origin_req_host=None , unverifiable=False):
|
||||||
|
headers['X-Gallery-Request-Method'] = 'get'
|
||||||
|
BaseRequest.__init__(self , url , apiKey , data , headers ,
|
||||||
|
origin_req_host , unverifiable)
|
||||||
|
|
||||||
|
class PostRequest(BaseRequest):
|
||||||
|
def __init__(self , url , apiKey , data , headers={} ,
|
||||||
|
origin_req_host=None , unverifiable=False):
|
||||||
|
headers['X-Gallery-Request-Method'] = 'post'
|
||||||
|
if 'Content-Type' not in headers:
|
||||||
|
headers['Content-Type'] = 'application/x-www-form-urlencoded'
|
||||||
|
BaseRequest.__init__(self , url , apiKey , data , headers ,
|
||||||
|
origin_req_host , unverifiable)
|
||||||
|
|
||||||
|
class PutRequest(BaseRequest):
|
||||||
|
def __init__(self , url , apiKey , data=None , headers={} ,
|
||||||
|
origin_req_host=None , unverifiable=False):
|
||||||
|
headers['X-Gallery-Request-Method'] = 'put'
|
||||||
|
BaseRequest.__init__(self , url , apiKey , data , headers ,
|
||||||
|
origin_req_host , unverifiable)
|
||||||
|
|
||||||
|
class DeleteRequest(BaseRequest):
|
||||||
|
def __init__(self , url , apiKey , data=None , headers={} ,
|
||||||
|
origin_req_host=None , unverifiable=False):
|
||||||
|
headers['X-Gallery-Request-Method'] = 'delete'
|
||||||
|
BaseRequest.__init__(self , url , apiKey , data , headers ,
|
||||||
|
origin_req_host , unverifiable)
|
24
3.0/client/Python/pylibgal3/libg3/__init__.py
Normal file
24
3.0/client/Python/pylibgal3/libg3/__init__.py
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
#
|
||||||
|
# Author: Jay Deiman
|
||||||
|
# Email: admin@splitstreams.com
|
||||||
|
#
|
||||||
|
# This file is part of pylibgal3.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 pylibgal3. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
from G3Items import *
|
||||||
|
from Gallery3 import *
|
||||||
|
|
||||||
|
__version__ = '0.1.4'
|
36
3.0/client/Python/pylibgal3/setup.py
Normal file
36
3.0/client/Python/pylibgal3/setup.py
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
#
|
||||||
|
# Author: Jay Deiman
|
||||||
|
# Email: admin@splitstreams.com
|
||||||
|
#
|
||||||
|
# This file is part of pylibgal3.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# pylibgal3 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 pylibgal3. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
from distutils.core import setup
|
||||||
|
from libg3 import __version__ as version
|
||||||
|
import sys
|
||||||
|
|
||||||
|
setup(name='pylibgal3' ,
|
||||||
|
version=version ,
|
||||||
|
author='Jay Deiman' ,
|
||||||
|
author_email='admin@splitstreams.com' ,
|
||||||
|
url='http://stuffivelearned.org' ,
|
||||||
|
description='A library for accessing/manipulating a Gallery 3 install' ,
|
||||||
|
packages=['libg3'] ,
|
||||||
|
package_dir={'libg3': 'libg3'} ,
|
||||||
|
)
|
@ -0,0 +1,76 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 about_this_album_block_Core {
|
||||||
|
|
||||||
|
static function get_site_list() {
|
||||||
|
return array("aboutthisalbum" => t("About This Album"));
|
||||||
|
}
|
||||||
|
|
||||||
|
static function get($block_id, $theme) {
|
||||||
|
switch ($block_id) {
|
||||||
|
case "aboutthisalbum":
|
||||||
|
$item = $theme->item;
|
||||||
|
if ((!$item) or (!$theme->item->is_album())) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
if ($theme->item->is_album()) {
|
||||||
|
$block = new Block();
|
||||||
|
$block->css_id = "g-about-this-album";
|
||||||
|
$block->content = new View("about_this_album.html");
|
||||||
|
|
||||||
|
if ($theme->item()->id == item::root()->id) {
|
||||||
|
$block->title = t("About this Site");
|
||||||
|
$block->content->album_count = ORM::factory("item")->where("type", "=", "album")->where("id", "<>", 1)->count_all();
|
||||||
|
$block->content->photo_count = ORM::factory("item")->where("type", "=", "photo")->count_all();
|
||||||
|
$block->content->vcount = Database::instance()->query("SELECT SUM({items}.view_count) as c FROM {items} WHERE type=\"photo\"")->current()->c;
|
||||||
|
} Else {
|
||||||
|
$block->title = t("About this Album");
|
||||||
|
$block->content->album_count = $item->descendants_count(array(array("type", "=", "album")));
|
||||||
|
$block->content->photo_count = $item->descendants_count(array(array("type", "=", "photo")));
|
||||||
|
// $block->content->vcount= $theme->item()->view_count;
|
||||||
|
$descds = $item->descendants();
|
||||||
|
$descds_view = 0;
|
||||||
|
foreach ($descds as $descd) {
|
||||||
|
if ($descd->is_photo()) {
|
||||||
|
$descds_view += $descd->view_count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$block->content->vcount = $descds_view;
|
||||||
|
if ($item->description) {
|
||||||
|
$block->content->description = html::clean($item->description);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$all_tags = ORM::factory("tag")
|
||||||
|
->join("items_tags", "items_tags.tag_id", "tags.id")
|
||||||
|
->join("items", "items.id", "items_tags.item_id", "LEFT")
|
||||||
|
->where("items.parent_id", "=", $item->id)
|
||||||
|
->order_by("tags.id", "ASC")
|
||||||
|
->find_all();
|
||||||
|
if (count($all_tags) > 0) {
|
||||||
|
$block->content->all_tags = $all_tags;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return $block;
|
||||||
|
}
|
||||||
|
}
|
3
3.0/modules/about_this_album/module.info
Normal file
3
3.0/modules/about_this_album/module.info
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
name = "About this Album"
|
||||||
|
description = "Show some simple, specific and useful info about a given album"
|
||||||
|
version = 1
|
68
3.0/modules/about_this_album/views/about_this_album.html.php
Normal file
68
3.0/modules/about_this_album/views/about_this_album.html.php
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
|
<? date_default_timezone_set('Australia/ACT'); ?>
|
||||||
|
<div class="g-metadata">
|
||||||
|
<span class="g-about-this">
|
||||||
|
<table cellspacing="0" cellpadding="0" border="0">
|
||||||
|
<? if ($album_count > 0): ?>
|
||||||
|
<tr>
|
||||||
|
<td><strong class="caption"><?= t("Albums: ") ?></strong></td>
|
||||||
|
<td><?= $album_count ?></td>
|
||||||
|
</tr>
|
||||||
|
<? endif ?>
|
||||||
|
<tr>
|
||||||
|
<td><strong class="caption"><?= t("Images: ") ?></strong></td>
|
||||||
|
<td><?= $photo_count ?></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><strong class="caption"><?= t("Views: ") ?></strong></td>
|
||||||
|
<td><?= $vcount ?></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<span >
|
||||||
|
|
||||||
|
<!--This Div will insert a margin either side of the desciption if there are tags to display-->
|
||||||
|
<? if (count($all_tags) > 0): ?>
|
||||||
|
<div style="margin-top: 10px; margin-bottom: 10px;">
|
||||||
|
<? endif ?>
|
||||||
|
|
||||||
|
<? if ($description <> ""): ?>
|
||||||
|
<strong class="caption"><?= t("Details: ") ?></strong>
|
||||||
|
<?= $description ?>
|
||||||
|
</span ><br>
|
||||||
|
<? endif ?>
|
||||||
|
|
||||||
|
<? if (count($all_tags) > 0): ?>
|
||||||
|
</div>
|
||||||
|
<span >
|
||||||
|
<strong class=="caption"><?= t("Tags: ") ?></strong>
|
||||||
|
</span >
|
||||||
|
<?
|
||||||
|
// Create an array to store the tag names and urls in.
|
||||||
|
$display_tags = array();
|
||||||
|
|
||||||
|
// Loop through all tags in the album, copying their
|
||||||
|
// names and urls into the array and skipping duplicates.
|
||||||
|
$last_tagid = "";
|
||||||
|
foreach ($all_tags as $one_tag) {
|
||||||
|
if ($last_tagid != $one_tag->id) {
|
||||||
|
$tag = ORM::factory("tag", $one_tag->id);
|
||||||
|
$display_tags[] = array(html::clean($tag->name), $tag->url());
|
||||||
|
$last_tagid = $one_tag->id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort the array.
|
||||||
|
asort($display_tags);
|
||||||
|
|
||||||
|
// Print out the list of tags as clickable links.
|
||||||
|
$not_first = 0;
|
||||||
|
foreach ($display_tags as $one_tag) {
|
||||||
|
if ($not_first++ > 0) {
|
||||||
|
print ", ";
|
||||||
|
}
|
||||||
|
print "<a href=\"" . $one_tag[1] . "\">" . $one_tag[0] . "</a>";
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<? endif ?>
|
||||||
|
</span>
|
||||||
|
</div>
|
@ -0,0 +1,71 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 about_this_photo_block_Core {
|
||||||
|
|
||||||
|
static function get_site_list() {
|
||||||
|
return array("simple" => t("About This Photo"));
|
||||||
|
}
|
||||||
|
|
||||||
|
static function get($block_id, $theme) {
|
||||||
|
$block = new Block();
|
||||||
|
switch ($block_id) {
|
||||||
|
case "simple":
|
||||||
|
$item = $theme->item;
|
||||||
|
if ((!$item) or (!$item->is_photo())) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
$block->css_id = "g-about-this-photo";
|
||||||
|
$block->title = t("About this photo");
|
||||||
|
$block->content = new View("about_this_photo.html");
|
||||||
|
|
||||||
|
// exif API doesn't give easy access to individual keys, so do this the hard way
|
||||||
|
if (module::is_active("exif")) {
|
||||||
|
$exif = ORM::factory("exif_record")->where("item_id", "=", $theme->item()->id)->find();
|
||||||
|
if ($exif->loaded()) {
|
||||||
|
$exif = unserialize($exif->data);
|
||||||
|
$timestamp = strtotime($exif["DateTime"]);
|
||||||
|
//$block->content->date = gallery::date($timestamp);
|
||||||
|
$block->content->date = date('D j M Y', $timestamp);
|
||||||
|
$block->content->time = gallery::time($timestamp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$block->content->vcount = $theme->item()->view_count;
|
||||||
|
|
||||||
|
// IPTC - copied more or less from iptc.php
|
||||||
|
if (module::is_active("iptc")) {
|
||||||
|
$record = ORM::factory("iptc_record")->where("item_id", "=", $theme->item()->id)->find();
|
||||||
|
if ($record->loaded()) {
|
||||||
|
$record = unserialize($record->data);
|
||||||
|
$block->content->name = $record["ObjectName"];
|
||||||
|
$block->content->caption = $record["Caption"];
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (module::is_active("tag")) {
|
||||||
|
$block->content->tags = tag::item_tags($theme->item());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return $block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
3
3.0/modules/about_this_photo/module.info
Normal file
3
3.0/modules/about_this_photo/module.info
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
name = "About this Photo"
|
||||||
|
description = "Show some simple, specific and useful info about a given photo"
|
||||||
|
version = 3
|
34
3.0/modules/about_this_photo/views/about_this_photo.html.php
Normal file
34
3.0/modules/about_this_photo/views/about_this_photo.html.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
|
<? date_default_timezone_set('Australia/ACT'); ?>
|
||||||
|
<div class="g-metadata">
|
||||||
|
<span class="g-about-this">
|
||||||
|
<table cellspacing="0" cellpadding="0" border="0">
|
||||||
|
<tr>
|
||||||
|
<td><strong class="caption"><?= t("Date: ") ?></strong></td>
|
||||||
|
<td><?= $date ?></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><strong class="caption"><?= t("Time: ") ?></strong></td>
|
||||||
|
<td><?= $time ?></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><strong class="caption"><?= t("Views: ") ?></strong></td>
|
||||||
|
<td><?= $vcount ?></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><strong class="caption"><?= t("Name: ") ?></strong></td>
|
||||||
|
<td><?= $name ?></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<div style="margin-top: 10px; margin-bottom: 10px;">
|
||||||
|
<strong class="caption"><?= t("Caption: ") ?></strong>
|
||||||
|
<?= $caption ?>
|
||||||
|
</div >
|
||||||
|
<span >
|
||||||
|
<strong class=="caption"><?= t("Tags: ") ?></strong>
|
||||||
|
<? foreach ($tags as $tag): ?>
|
||||||
|
<a href="<?= $tag->url() ?>"><?= html::clean($tag->name) ?></a>,
|
||||||
|
<? endforeach?>
|
||||||
|
</span ><br>
|
||||||
|
</span>
|
||||||
|
</div>
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -0,0 +1,69 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 Admin_Albumpassword_Controller extends Admin_Controller {
|
||||||
|
public function index() {
|
||||||
|
|
||||||
|
// Generate a new admin page.
|
||||||
|
$view = new Admin_View("admin.html");
|
||||||
|
$view->content = new View("admin_albumpassword.html");
|
||||||
|
|
||||||
|
// Generate a form for controlling the admin section.
|
||||||
|
$view->content->albumpassword_form = $this->_get_admin_form();
|
||||||
|
|
||||||
|
// Display the page.
|
||||||
|
print $view;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function _get_admin_form() {
|
||||||
|
// Make a new form for changing admin settings for this module.
|
||||||
|
$form = new Forge("admin/albumpassword/saveprefs", "", "post",
|
||||||
|
array("id" => "g-album-password-admin-form"));
|
||||||
|
|
||||||
|
// Should protected items be hidden, or completely in-accessable?
|
||||||
|
$albumpassword_group = $form->group("album_password_group");
|
||||||
|
$albumpassword_group->checkbox("hideonly")
|
||||||
|
->label("Only hide protected albums?")
|
||||||
|
->checked(module::get_var("albumpassword", "hideonly"));
|
||||||
|
|
||||||
|
// Add a save button to the form.
|
||||||
|
$albumpassword_group->submit("save_settings")->value(t("Save"));
|
||||||
|
|
||||||
|
// Return the newly generated form.
|
||||||
|
return $form;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function saveprefs() {
|
||||||
|
// Save user specified preferences.
|
||||||
|
|
||||||
|
// Prevent Cross Site Request Forgery
|
||||||
|
access::verify_csrf();
|
||||||
|
|
||||||
|
// Retrieve submitted form data.
|
||||||
|
if (Input::instance()->post("hideonly") == false) {
|
||||||
|
module::set_var("albumpassword", "hideonly", false);
|
||||||
|
} else {
|
||||||
|
module::set_var("albumpassword", "hideonly", true);
|
||||||
|
}
|
||||||
|
// Display a success message and redirect back to the TagsMap admin page.
|
||||||
|
message::success(t("Your settings have been saved."));
|
||||||
|
url::redirect("admin/albumpassword");
|
||||||
|
}
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -49,9 +49,12 @@ class albumpassword_Controller extends Controller {
|
|||||||
access::required("view", $item);
|
access::required("view", $item);
|
||||||
access::required("edit", $item);
|
access::required("edit", $item);
|
||||||
|
|
||||||
// Check for and delete the password.
|
// Check for and delete the password and any cached ids assigned to it.
|
||||||
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $id)->find();
|
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $id)->find_all();
|
||||||
if ($existing_password->loaded()) {
|
if (count($existing_password) > 0) {
|
||||||
|
foreach ($existing_password as $one_password) {
|
||||||
|
db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute();
|
||||||
|
}
|
||||||
db::build()->delete("items_albumpasswords")->where("album_id", "=", $id)->execute();
|
db::build()->delete("items_albumpasswords")->where("album_id", "=", $id)->execute();
|
||||||
message::success(t("Password Removed."));
|
message::success(t("Password Removed."));
|
||||||
}
|
}
|
||||||
@ -70,9 +73,12 @@ class albumpassword_Controller extends Controller {
|
|||||||
$album_id = Input::instance()->post("item_id");
|
$album_id = Input::instance()->post("item_id");
|
||||||
$album_password = Input::instance()->post("assignpassword_password");
|
$album_password = Input::instance()->post("assignpassword_password");
|
||||||
|
|
||||||
// Check for, and remove, any existing passwords.
|
// Check for, and remove, any existing passwords and cached ids.
|
||||||
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find();
|
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find_all();
|
||||||
if ($existing_password->loaded()) {
|
if (count($existing_password) > 0) {
|
||||||
|
foreach ($existing_password as $one_password) {
|
||||||
|
db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute();
|
||||||
|
}
|
||||||
db::build()->delete("items_albumpasswords")->where("album_id", "=", $album_id)->execute();
|
db::build()->delete("items_albumpasswords")->where("album_id", "=", $album_id)->execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,9 +88,28 @@ class albumpassword_Controller extends Controller {
|
|||||||
$new_password->password = $album_password;
|
$new_password->password = $album_password;
|
||||||
$new_password->save();
|
$new_password->save();
|
||||||
|
|
||||||
|
// Add the album to the id cache.
|
||||||
|
$cached_album = ORM::factory("albumpassword_idcache");
|
||||||
|
$cached_album->password_id = $new_password->id;
|
||||||
|
$cached_album->item_id = $album_id;
|
||||||
|
$cached_album->save();
|
||||||
|
|
||||||
|
// Check for any sub-items within the album, add all of them to the id cache.
|
||||||
|
$items = ORM::factory("item", $album_id)
|
||||||
|
->viewable()
|
||||||
|
->descendants();
|
||||||
|
if (count($items) > 0) {
|
||||||
|
foreach ($items as $one_item) {
|
||||||
|
$cached_item = ORM::factory("albumpassword_idcache");
|
||||||
|
$cached_item->password_id = $new_password->id;
|
||||||
|
$cached_item->item_id = $one_item->id;
|
||||||
|
$cached_item->save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Display a success message and close the dialog.
|
// Display a success message and close the dialog.
|
||||||
message::success(t("Password saved."));
|
message::success(t("Password saved."));
|
||||||
json::reply(array("result" => "success"));
|
print "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function logout() {
|
public function logout() {
|
||||||
@ -112,10 +137,10 @@ class albumpassword_Controller extends Controller {
|
|||||||
// If not, close the dialog and display a rejected message.
|
// If not, close the dialog and display a rejected message.
|
||||||
cookie::set("g3_albumpassword", $album_password);
|
cookie::set("g3_albumpassword", $album_password);
|
||||||
message::success(t("Password Accepted."));
|
message::success(t("Password Accepted."));
|
||||||
json::reply(array("result" => "success"));
|
print "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\n";
|
||||||
} else {
|
} else {
|
||||||
message::error(t("Password Rejected."));
|
message::error(t("Password Rejected."));
|
||||||
json::reply(array("result" => "success"));
|
print "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -129,7 +154,7 @@ class albumpassword_Controller extends Controller {
|
|||||||
$assignpassword_group->input("assignpassword_password")
|
$assignpassword_group->input("assignpassword_password")
|
||||||
->id('assignpassword_password')
|
->id('assignpassword_password')
|
||||||
->label(t("Password:"));
|
->label(t("Password:"));
|
||||||
$form->submit("save_password")->value(t("Save"));
|
$assignpassword_group->submit("save_password")->value(t("Save"));
|
||||||
|
|
||||||
// Return the newly generated form.
|
// Return the newly generated form.
|
||||||
return $form;
|
return $form;
|
||||||
@ -139,12 +164,14 @@ class albumpassword_Controller extends Controller {
|
|||||||
// Generate a form for allowing visitors to enter in their passwords.
|
// Generate a form for allowing visitors to enter in their passwords.
|
||||||
$form = new Forge("albumpassword/checkpassword", "", "post",
|
$form = new Forge("albumpassword/checkpassword", "", "post",
|
||||||
array("id" => "g-login-password-form"));
|
array("id" => "g-login-password-form"));
|
||||||
|
|
||||||
$assignpassword_group = $form->group("Enter Password")
|
$assignpassword_group = $form->group("Enter Password")
|
||||||
->label(t("Enter Password:"));
|
->label(t("Enter Password:"));
|
||||||
$assignpassword_group->input("albumpassword_password")
|
$assignpassword_group->password("albumpassword_password")
|
||||||
->id('albumpassword_password')
|
->id('albumpassword_password')
|
||||||
->label(t("Password:"));
|
->label(t("Password:"));
|
||||||
$form->submit("login_password")->value(t("Login"));
|
|
||||||
|
$assignpassword_group->submit("")->value(t("Login"));
|
||||||
|
|
||||||
// Return the newly generated form.
|
// Return the newly generated form.
|
||||||
return $form;
|
return $form;
|
||||||
|
49
3.0/modules/albumpassword/helpers/MY_access.php
Normal file
49
3.0/modules/albumpassword/helpers/MY_access.php
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 access extends access_Core {
|
||||||
|
static function required($perm_name, $item) {
|
||||||
|
// Original code from the required function in modules/gallery/helpers/access.php.
|
||||||
|
if (!access::can($perm_name, $item)) {
|
||||||
|
if ($perm_name == "view") {
|
||||||
|
// Treat as if the item didn't exist, don't leak any information.
|
||||||
|
throw new Kohana_404_Exception();
|
||||||
|
} else {
|
||||||
|
access::forbidden();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Begin rWatcher modifications.
|
||||||
|
// Throw a 404 error when a user attempts to access a protected item,
|
||||||
|
// unless the password has been provided, or the user is the item's owner.
|
||||||
|
} elseif (module::get_var("albumpassword", "hideonly") == false) {
|
||||||
|
$item_protected = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->id)->order_by("cache_id")->find_all();
|
||||||
|
if (count($item_protected) > 0) {
|
||||||
|
$existing_password = ORM::factory("items_albumpassword")->where("id", "=", $item_protected[0]->password_id)->find();
|
||||||
|
if ($existing_password->loaded()) {
|
||||||
|
if ((cookie::get("g3_albumpassword") != $existing_password->password) &&
|
||||||
|
(identity::active_user()->id != $item->owner_id) &&
|
||||||
|
(!identity::active_user()->admin)) {
|
||||||
|
throw new Kohana_404_Exception();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -20,32 +20,30 @@
|
|||||||
|
|
||||||
class item extends item_Core {
|
class item extends item_Core {
|
||||||
static function viewable($model) {
|
static function viewable($model) {
|
||||||
// Hide the contents of a password protected album,
|
// Hide password protected albums until the correct password is entered,
|
||||||
// Unless the current user is an admin, or the albums owner.
|
// unless the current user is an admin, or the albums owner.
|
||||||
|
|
||||||
$model = item_Core::viewable($model);
|
$model = item_Core::viewable($model);
|
||||||
$album_item = ORM::factory("item")->where("id", "=", $model->id)->find();
|
|
||||||
|
|
||||||
// Figure out if the user can access this album.
|
// If the user is an admin, don't hide anything anything.
|
||||||
$deny_access = false;
|
// If not, hide whatever is restricted by an album password
|
||||||
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $model->id)->find();
|
// that the current user is not the owner of.
|
||||||
if ($existing_password->loaded()) {
|
|
||||||
if ((cookie::get("g3_albumpassword") != $existing_password->password) &&
|
|
||||||
(identity::active_user()->id != $album_item->owner_id))
|
|
||||||
$deny_access = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// set access::DENY if necessary.
|
|
||||||
if ($deny_access == true) {
|
|
||||||
$view_restrictions = array();
|
|
||||||
if (!identity::active_user()->admin) {
|
if (!identity::active_user()->admin) {
|
||||||
foreach (identity::group_ids_for_active_user() as $id) {
|
|
||||||
$view_restrictions[] = array("items.view_$id", "=", access::DENY);
|
// Display items that are not in idcaches.
|
||||||
|
$model->and_open()->join("albumpassword_idcaches", "items.id", "albumpassword_idcaches.item_id", "LEFT OUTER")
|
||||||
|
->and_where("albumpassword_idcaches.item_id", "IS", NULL);
|
||||||
|
|
||||||
|
// ... Unless their password id corresponds with a valid password.
|
||||||
|
$existing_password = ORM::factory("items_albumpassword")->where("password", "=", cookie::get("g3_albumpassword"))->find_all();
|
||||||
|
if (count($existing_password) > 0) {
|
||||||
|
foreach ($existing_password as $one_password) {
|
||||||
|
$model->or_where("albumpassword_idcaches.password_id", "=", $one_password->id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (count($view_restrictions)) {
|
// Or the current user is the owner of the item.
|
||||||
$model->and_open()->merge_or_where($view_restrictions)->close();
|
$model->or_where("items.owner_id", "=", identity::active_user()->id)->close();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $model;
|
return $model;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -80,7 +80,14 @@ class albumpassword_event_Core {
|
|||||||
->label(t("Remove password"))
|
->label(t("Remove password"))
|
||||||
->css_id("g-album-password-remove")
|
->css_id("g-album-password-remove")
|
||||||
->url(url::site("albumpassword/remove/" . $item->id)));
|
->url(url::site("albumpassword/remove/" . $item->id)));
|
||||||
} else {
|
} elseif ($item->id != 1) {
|
||||||
|
$passworded_subitems = ORM::factory("item", $item->id)
|
||||||
|
->and_open()->join("albumpassword_idcaches", "items.id", "albumpassword_idcaches.item_id", "LEFT OUTER")
|
||||||
|
->where("albumpassword_idcaches.item_id", "IS NOT", NULL)->close()
|
||||||
|
->descendants();
|
||||||
|
|
||||||
|
$existing_cacheditem = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->id)->order_by("cache_id")->find_all();
|
||||||
|
if ((count($existing_cacheditem) == 0) && count($passworded_subitems) == 0) {
|
||||||
$menu->get("options_menu")
|
$menu->get("options_menu")
|
||||||
->append(Menu::factory("dialog")
|
->append(Menu::factory("dialog")
|
||||||
->id("albumpassword_assign")
|
->id("albumpassword_assign")
|
||||||
@ -91,14 +98,53 @@ class albumpassword_event_Core {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static function item_deleted($item) {
|
static function item_deleted($item) {
|
||||||
// If an album is deleted, remove any associated passwords.
|
// Check for and delete the password and any cached ids assigned to it.
|
||||||
$existingPasswords = ORM::factory("items_albumpassword")
|
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $item->id)->find_all();
|
||||||
->where("album_id", "=", $item->id)
|
if (count($existing_password) > 0) {
|
||||||
->find_all();
|
foreach ($existing_password as $one_password) {
|
||||||
if (count($existingPasswords) > 0) {
|
db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute();
|
||||||
db::build()->delete("items_albumpassword")->where("album_id", "=", $item->id)->execute();
|
|
||||||
}
|
}
|
||||||
|
db::build()->delete("items_albumpasswords")->where("album_id", "=", $item->id)->execute();
|
||||||
|
message::success(t("Password Removed."));
|
||||||
|
} else {
|
||||||
|
db::build()->delete("albumpassword_idcaches")->where("item_id", "=", $item->id)->execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static function item_created($item) {
|
||||||
|
// Check for any already existing password on parent album(s), if found, generate cache data for the new item.
|
||||||
|
$existing_password = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->parent_id)->order_by("cache_id")->find_all();
|
||||||
|
if (count($existing_password) > 0) {
|
||||||
|
$new_cachedid = ORM::factory("albumpassword_idcache");
|
||||||
|
$new_cachedid->password_id = $existing_password[0]->password_id;
|
||||||
|
$new_cachedid->item_id = $item->id;
|
||||||
|
$new_cachedid->save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static function item_moved($item, $old_parent) {
|
||||||
|
// Delete any existing cache data.
|
||||||
|
db::build()->delete("albumpassword_idcaches")->where("item_id", "=", $item->id)->execute();
|
||||||
|
|
||||||
|
// Check for a password on the new parent, generate cache data if necessary.
|
||||||
|
$existing_password = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->parent_id)->order_by("cache_id")->find_all();
|
||||||
|
if (count($existing_password) > 0) {
|
||||||
|
$new_cachedid = ORM::factory("albumpassword_idcache");
|
||||||
|
$new_cachedid->password_id = $existing_password[0]->password_id;
|
||||||
|
$new_cachedid->item_id = $item->id;
|
||||||
|
$new_cachedid->save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static function admin_menu($menu, $theme) {
|
||||||
|
// Add a link to the Album Password admin page to the Content menu.
|
||||||
|
$menu->get("settings_menu")
|
||||||
|
->append(Menu::factory("link")
|
||||||
|
->id("albumpassword")
|
||||||
|
->label(t("Album Password Settings"))
|
||||||
|
->url(url::site("admin/albumpassword")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -28,15 +28,45 @@ class albumpassword_installer {
|
|||||||
PRIMARY KEY (`id`))
|
PRIMARY KEY (`id`))
|
||||||
DEFAULT CHARSET=utf8;");
|
DEFAULT CHARSET=utf8;");
|
||||||
|
|
||||||
|
// Create a table to store a list of all protected items in.
|
||||||
|
$db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} (
|
||||||
|
`cache_id` int(9) NOT NULL auto_increment,
|
||||||
|
`password_id` int(9) NOT NULL,
|
||||||
|
`item_id` int(9) NOT NULL,
|
||||||
|
PRIMARY KEY (`cache_id`))
|
||||||
|
DEFAULT CHARSET=utf8;");
|
||||||
|
|
||||||
|
// Set the default value for this module's behavior.
|
||||||
|
module::set_var("albumpassword", "hideonly", true);
|
||||||
|
|
||||||
// Set the module's version number.
|
// Set the module's version number.
|
||||||
module::set_version("albumpassword", 1);
|
module::set_version("albumpassword", 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function upgrade($version) {
|
||||||
|
$db = Database::instance();
|
||||||
|
if ($version == 1) {
|
||||||
|
// Set the default value for this module's behavior.
|
||||||
|
module::set_var("albumpassword", "hideonly", true);
|
||||||
|
module::set_version("albumpassword", $version = 2);
|
||||||
|
}
|
||||||
|
if ($version == 2) {
|
||||||
|
// Create a table to store a list of all protected items in.
|
||||||
|
$db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} (
|
||||||
|
`cache_id` int(9) NOT NULL auto_increment,
|
||||||
|
`password_id` int(9) NOT NULL,
|
||||||
|
`item_id` int(9) NOT NULL,
|
||||||
|
PRIMARY KEY (`cache_id`))
|
||||||
|
DEFAULT CHARSET=utf8;");
|
||||||
|
module::set_version("albumpassword", $version = 3);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static function uninstall() {
|
static function uninstall() {
|
||||||
// Delete the password table before uninstalling.
|
// Delete the password table before uninstalling.
|
||||||
$db = Database::instance();
|
$db = Database::instance();
|
||||||
$db->query("DROP TABLE IF EXISTS {items_albumpassword};");
|
$db->query("DROP TABLE IF EXISTS {items_albumpasswords};");
|
||||||
|
$db->query("DROP TABLE IF EXISTS {albumpassword_idcaches};");
|
||||||
module::delete("albumpassword");
|
module::delete("albumpassword");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
138
3.0/modules/albumpassword/helpers/albumpassword_task.php
Normal file
138
3.0/modules/albumpassword/helpers/albumpassword_task.php
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 albumpassword_task_Core {
|
||||||
|
static function available_tasks() {
|
||||||
|
// Check for any albums listed in albumpasswords but not idcaches.
|
||||||
|
// If found, set the severity for this task to warning, as there's
|
||||||
|
// obviously something missing from idcaches.
|
||||||
|
$bad_albums = ORM::factory("items_albumpassword")
|
||||||
|
->join("albumpassword_idcaches", "items_albumpasswords.id", "albumpassword_idcaches.password_id", "LEFT OUTER")
|
||||||
|
->and_where("albumpassword_idcaches.password_id", "IS", NULL)->count_all();
|
||||||
|
|
||||||
|
return array(Task_Definition::factory()
|
||||||
|
->callback("albumpassword_task::update_idcaches")
|
||||||
|
->name(t("Rebuild Album Password ID Caches DB"))
|
||||||
|
->description(t("Logs the contents of all protected albums into the db."))
|
||||||
|
->severity($bad_albums ? log::WARNING : log::SUCCESS));
|
||||||
|
}
|
||||||
|
|
||||||
|
static function update_idcaches($task) {
|
||||||
|
// Populate the idcaches table with the contents of all protected albums.
|
||||||
|
|
||||||
|
$start = microtime(true);
|
||||||
|
$total = $task->get("total");
|
||||||
|
$existing_passwords = ORM::factory("items_albumpassword")->find_all();
|
||||||
|
// If this is the first time this function has been run,
|
||||||
|
// delete and re-create the idcaches table, and set up
|
||||||
|
// some initial variables.
|
||||||
|
if (empty($total)) {
|
||||||
|
// Delete the idcache table and make a new one.
|
||||||
|
$db = Database::instance();
|
||||||
|
$db->query("DROP TABLE IF EXISTS {albumpassword_idcaches};");
|
||||||
|
$db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} (
|
||||||
|
`cache_id` int(9) NOT NULL auto_increment,
|
||||||
|
`password_id` int(9) NOT NULL,
|
||||||
|
`item_id` int(9) NOT NULL,
|
||||||
|
PRIMARY KEY (`cache_id`))
|
||||||
|
DEFAULT CHARSET=utf8;");
|
||||||
|
|
||||||
|
// Set the initial values for all variables.
|
||||||
|
$task->set("total", count($existing_passwords));
|
||||||
|
$total = $task->get("total");
|
||||||
|
$task->set("last_album_counter", 0);
|
||||||
|
$task->set("last_id", 0);
|
||||||
|
$task->set("completed_albums", 0);
|
||||||
|
$task->set("completed_items", 0);
|
||||||
|
$task->set("total_items", 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve the values for variables from the last time this
|
||||||
|
// function was run.
|
||||||
|
$last_album_counter = $task->get("last_album_counter");
|
||||||
|
$completed_albums = $task->get("completed_albums");
|
||||||
|
$completed_items = $task->get("completed_items");
|
||||||
|
$total_items = $task->get("total_items");
|
||||||
|
$last_id = $task->get("last_id");
|
||||||
|
|
||||||
|
// If completed_items is 0, then we're just starting to process this
|
||||||
|
// album. Add the album to idcaches before adding it's contents.
|
||||||
|
if ($completed_items == 0) {
|
||||||
|
// Add the album to the id cache.
|
||||||
|
$cached_album = ORM::factory("albumpassword_idcache");
|
||||||
|
$cached_album->password_id = $existing_passwords[$last_album_counter]->id;
|
||||||
|
$cached_album->item_id = $existing_passwords[$last_album_counter]->album_id;
|
||||||
|
$cached_album->save();
|
||||||
|
|
||||||
|
// Set total_items to the number of items in this album.
|
||||||
|
$total_items = ORM::factory("item", $existing_passwords[$last_album_counter]->album_id)
|
||||||
|
->descendants_count();
|
||||||
|
$task->set("total_items", $total_items);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add each item in the album to idcaches.
|
||||||
|
foreach (ORM::factory("item", $existing_passwords[$last_album_counter]->album_id)
|
||||||
|
->where("id", ">", $last_id)
|
||||||
|
->order_by("id")
|
||||||
|
->descendants(100) as $item) {
|
||||||
|
|
||||||
|
$cached_item = ORM::factory("albumpassword_idcache");
|
||||||
|
$cached_item->password_id =$existing_passwords[$last_album_counter]->id;
|
||||||
|
$cached_item->item_id = $item->id;
|
||||||
|
$cached_item->save();
|
||||||
|
|
||||||
|
$last_id = $item->id;
|
||||||
|
$completed_items++;
|
||||||
|
|
||||||
|
// Set a time limit so the script doesn't time out.
|
||||||
|
if (microtime(true) - $start > 1.5) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} // end foreach
|
||||||
|
|
||||||
|
// If completed_items equals total_items, then we've
|
||||||
|
// processed everything in the current album.
|
||||||
|
// Increase variables and set everything up for the
|
||||||
|
// next album.
|
||||||
|
if ($completed_items == $total_items) {
|
||||||
|
$completed_items = 0;
|
||||||
|
$last_album_counter++;
|
||||||
|
$completed_albums++;
|
||||||
|
$last_id = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store the current values of the variables for the next
|
||||||
|
// time this function is called.
|
||||||
|
$task->set("last_album_counter", $last_album_counter);
|
||||||
|
$task->set("last_id", $last_id);
|
||||||
|
$task->set("completed_albums", $completed_albums);
|
||||||
|
$task->set("completed_items", $completed_items);
|
||||||
|
|
||||||
|
// Display the number of albums that have been completed before exiting.
|
||||||
|
if ($total == $completed_albums) {
|
||||||
|
$task->done = true;
|
||||||
|
$task->state = "success";
|
||||||
|
$task->percent_complete = 100;
|
||||||
|
$task->status = t("Scanning Protected Album $completed_albums of $total");
|
||||||
|
} else {
|
||||||
|
$task->percent_complete = round(100 * $completed / $total);
|
||||||
|
$task->status = t("Scanning Protected Album $completed_albums of $total -- $completed_items / $total_items files");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
21
3.0/modules/albumpassword/models/albumpassword_idcache.php
Normal file
21
3.0/modules/albumpassword/models/albumpassword_idcache.php
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 Albumpassword_Idcache_Model extends ORM {
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
name = "Album Password"
|
name = "Album Password"
|
||||||
description = "Restrict access to individual albums."
|
description = "Restrict access to individual albums."
|
||||||
version = 1
|
version = 3
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
|
<h2>
|
||||||
|
<?= t("Album Password Admin") ?>
|
||||||
|
</h2>
|
||||||
|
<br />
|
||||||
|
<div class="g-block">
|
||||||
|
<?= t("If this box is checked, protected albums will only be hidden. Anyone with the URL to either the album or it's contents will be able to access it without a password.") ?><br /><br />
|
||||||
|
<?= $albumpassword_form ?>
|
||||||
|
</div>
|
@ -1,20 +1,3 @@
|
|||||||
<script type="text/javascript">
|
|
||||||
function ajaxify_login_reset_form() {
|
|
||||||
$("#g-login form").ajaxForm({
|
|
||||||
dataType: "json",
|
|
||||||
success: function(data) {
|
|
||||||
if (data.form) {
|
|
||||||
$("#g-login form").replaceWith(data.form);
|
|
||||||
ajaxify_login_reset_form();
|
|
||||||
}
|
|
||||||
if (data.result == "success") {
|
|
||||||
$("#g-dialog").dialog("close");
|
|
||||||
window.location.reload();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<div id="g-assign-password">
|
<div id="g-assign-password">
|
||||||
<ul>
|
<ul>
|
||||||
<li id="g-assign-password-form">
|
<li id="g-assign-password-form">
|
||||||
|
@ -1,20 +1,3 @@
|
|||||||
<script type="text/javascript">
|
|
||||||
function ajaxify_login_reset_form() {
|
|
||||||
$("#g-login form").ajaxForm({
|
|
||||||
dataType: "json",
|
|
||||||
success: function(data) {
|
|
||||||
if (data.form) {
|
|
||||||
$("#g-login form").replaceWith(data.form);
|
|
||||||
ajaxify_login_reset_form();
|
|
||||||
}
|
|
||||||
if (data.result == "success") {
|
|
||||||
$("#g-dialog").dialog("close");
|
|
||||||
window.location.reload();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<div id="g-login-password">
|
<div id="g-login-password">
|
||||||
<ul>
|
<ul>
|
||||||
<li id="g-login-password-form">
|
<li id="g-login-password-form">
|
||||||
|
38
3.0/modules/albumtree/helpers/albumtree_block.php
Normal file
38
3.0/modules/albumtree/helpers/albumtree_block.php
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 albumtree_block_Core {
|
||||||
|
static function get_site_list() {
|
||||||
|
return array("albumtree" => t("Album tree"));
|
||||||
|
}
|
||||||
|
|
||||||
|
static function get($block_id) {
|
||||||
|
$block = new Block();
|
||||||
|
switch ($block_id) {
|
||||||
|
case "albumtree":
|
||||||
|
$style = module::get_var("albumtree", "style", "select");
|
||||||
|
$block->css_id = "g-albumtree";
|
||||||
|
$block->title = t("Album Tree");
|
||||||
|
$block->content = new View("albumtree_block_{$style}.html");
|
||||||
|
$block->content->root = item::root();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return $block;
|
||||||
|
}
|
||||||
|
}
|
33
3.0/modules/albumtree/helpers/albumtree_installer.php
Normal file
33
3.0/modules/albumtree/helpers/albumtree_installer.php
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 albumtree_installer {
|
||||||
|
static function install() {
|
||||||
|
module::set_var("albumtree", "style", "select");
|
||||||
|
module::set_version("albumtree", 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function upgrade($version) {
|
||||||
|
$db = Database::instance();
|
||||||
|
if ($version == 1) {
|
||||||
|
module::set_var("albumtree", "style", "select");
|
||||||
|
module::set_version("albumtree", $version = 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
3
3.0/modules/albumtree/module.info
Normal file
3
3.0/modules/albumtree/module.info
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
name = "Album Tree"
|
||||||
|
description = "Provides a block in the sidebar with quick links to all other albums."
|
||||||
|
version = 2
|
38
3.0/modules/albumtree/views/albumtree_block_list.html.php
Normal file
38
3.0/modules/albumtree/views/albumtree_block_list.html.php
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
|
<style type="text/css">
|
||||||
|
ul.treealbumnav {
|
||||||
|
height: 225px;
|
||||||
|
width: 190px;
|
||||||
|
overflow: auto;
|
||||||
|
border: 1px solid #666;
|
||||||
|
padding: 2px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<ul class="treealbumnav">
|
||||||
|
<? // We'll keep track of the list of items that we want to display in a stack ?>
|
||||||
|
<? $stack = array(array(0, $root)) ?>
|
||||||
|
|
||||||
|
<? // While there are still items to show, pick the next one and show it ?>
|
||||||
|
<? while ($stack): ?>
|
||||||
|
<? list($level, $album) = array_pop($stack) ?>
|
||||||
|
<li>
|
||||||
|
<a href="/index.php/items/<?= $album->id ?>"><?= str_repeat(" ", $level) ?><?= $album->title ?>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<? // Then take all of that album's children and put them next on the stack. ?>
|
||||||
|
<? $tmp = array(); ?>
|
||||||
|
<? foreach ($album->viewable()->children(null, null, array(array("type", "=", "album"))) as $child): ?>
|
||||||
|
<? $tmp[] = array($level + 1, $child) ?>
|
||||||
|
<? endforeach ?>
|
||||||
|
|
||||||
|
<? // Since we'll pull them off the stack in the opposite order that we put them on, ?>
|
||||||
|
<? // and the order that we put them on is the order in which we want to display them, ?>
|
||||||
|
<? // We need to reverse the order of the children on the stack ?>
|
||||||
|
<? if ($tmp): ?>
|
||||||
|
<? $stack = array_merge($stack, array_reverse($tmp)) ?>
|
||||||
|
<? endif ?>
|
||||||
|
<? endwhile ?>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
|
24
3.0/modules/albumtree/views/albumtree_block_select.html.php
Normal file
24
3.0/modules/albumtree/views/albumtree_block_select.html.php
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
|
<select onchange="window.location='<?= url::site("items/__ID__")?>'.replace('__ID__', this.value)">
|
||||||
|
<? // We'll keep track of the list of items that we want to display in a stack ?>
|
||||||
|
<? $stack = array(array(0, $root)) ?>
|
||||||
|
|
||||||
|
<? // While there are still items to show, pick the next one and show it ?>
|
||||||
|
<? while ($stack): ?>
|
||||||
|
<? list($level, $album) = array_pop($stack) ?>
|
||||||
|
<option value="<?= $album->id ?>"><?= str_repeat(" ", $level) ?><?= $album->title ?></option>
|
||||||
|
|
||||||
|
<? // Then take all of that album's children and put them next on the stack. ?>
|
||||||
|
<? $tmp = array(); ?>
|
||||||
|
<? foreach ($album->viewable()->children(null, null, array(array("type", "=", "album"))) as $child): ?>
|
||||||
|
<? $tmp[] = array($level + 1, $child) ?>
|
||||||
|
<? endforeach ?>
|
||||||
|
|
||||||
|
<? // Since we'll pull them off the stack in the opposite order that we put them on, ?>
|
||||||
|
<? // and the order that we put them on is the order in which we want to display them, ?>
|
||||||
|
<? // We need to reverse the order of the children on the stack ?>
|
||||||
|
<? if ($tmp): ?>
|
||||||
|
<? $stack = array_merge($stack, array_reverse($tmp)) ?>
|
||||||
|
<? endif ?>
|
||||||
|
<? endwhile ?>
|
||||||
|
</select>
|
3
3.0/modules/atom/module.info
Normal file
3
3.0/modules/atom/module.info
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
name = "Atom"
|
||||||
|
description = "Enable Atom feeds in your Gallery"
|
||||||
|
version = 1
|
121
3.0/modules/author/helpers/author.php
Normal file
121
3.0/modules/author/helpers/author.php
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is the API for handling exif data.
|
||||||
|
*/
|
||||||
|
class author_Core {
|
||||||
|
static function fix($item) {
|
||||||
|
if ($item->is_album()) { return false; }
|
||||||
|
|
||||||
|
$mime = $item->mime_type;
|
||||||
|
if ($mime == 'image/jpeg' || $mime == 'image/png' || $mime == 'image/gif') {}
|
||||||
|
else { return false; }
|
||||||
|
|
||||||
|
$owner = ORM::factory("user")->where("id", "=", $item->owner_id)->find();
|
||||||
|
$user_name = $owner->full_name;
|
||||||
|
|
||||||
|
$exiv = module::get_var('author', 'exiv_path');
|
||||||
|
$version = module::get_var('author', 'exiv_version');
|
||||||
|
|
||||||
|
/*
|
||||||
|
Debian stable ships with exiv2 0.16 at the time of writing. You get
|
||||||
|
roughly the same output out of the utility as with 0.20, but you have
|
||||||
|
to invoke it several times.
|
||||||
|
|
||||||
|
The real threshhold for this might be somewhere between 0.16 and 0.20,
|
||||||
|
but the 0.16 way of doing things is forward compatible.
|
||||||
|
*/
|
||||||
|
$exivData = array();
|
||||||
|
if ($version < 0.20) {
|
||||||
|
exec("$exiv -p x " . escapeshellarg($item->file_path()), $exivData);
|
||||||
|
exec("$exiv -p i " . escapeshellarg($item->file_path()), $exivData);
|
||||||
|
exec("$exiv -p t " . escapeshellarg($item->file_path()), $exivData);
|
||||||
|
} else {
|
||||||
|
exec("$exiv -p a " . escapeshellarg($item->file_path()), $exivData);
|
||||||
|
}
|
||||||
|
|
||||||
|
$has = array();
|
||||||
|
$mod = array();
|
||||||
|
foreach ($exivData as $line)
|
||||||
|
{
|
||||||
|
$tokens = preg_split('/\s+/', $line, 4);
|
||||||
|
$has[ $tokens[0] ] = $tokens[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
$candidates = array(
|
||||||
|
$has['Xmp.dc.creator'],
|
||||||
|
$has['Iptc.Application2.Byline'],
|
||||||
|
$has['Exif.Image.Artist'],
|
||||||
|
$user_name,
|
||||||
|
'Unknown');
|
||||||
|
|
||||||
|
foreach ($candidates as $cand) {
|
||||||
|
if ($cand != '') { $byline = $cand; break; }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!array_key_exists('Exif.Image.Artist', $has)) { $mod['Exif.Image.Artist'] = $byline; }
|
||||||
|
if (!array_key_exists('Iptc.Application2.Byline', $has)) { $mod['Iptc.Application2.Byline'] = $byline; }
|
||||||
|
|
||||||
|
/* Apply the credit block */
|
||||||
|
$credit = module::get_var("author", "credit");
|
||||||
|
if ($credit != '') {
|
||||||
|
$mod['Iptc.Application2.Credit'] = $credit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Older versions doesn't support XMP writing.
|
||||||
|
*/
|
||||||
|
if ($version >= 0.20) {
|
||||||
|
if (!array_key_exists('Xmp.dc.creator', $has)) { $mod['Xmp.dc.creator'] = $byline; }
|
||||||
|
|
||||||
|
/* Apply our own image terms URL */
|
||||||
|
$terms = module::get_var("author", "usage_terms");
|
||||||
|
if ($terms != '') {
|
||||||
|
$mod['Xmp.xmpRights.UsageTerms'] = 'http://wiki.sverok.se/wiki/Bildbank-Bilder';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$line = $exiv . ' ';
|
||||||
|
foreach ($mod as $key => $value) {
|
||||||
|
$line .= "-M \"set $key " . escapeshellarg($value) . "\" ";
|
||||||
|
}
|
||||||
|
|
||||||
|
$files = array(
|
||||||
|
$item->file_path(),
|
||||||
|
$item->thumb_path(),
|
||||||
|
$item->resize_path()
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach ($files as $file) {
|
||||||
|
system("$line " . escapeshellarg($file));
|
||||||
|
}
|
||||||
|
|
||||||
|
$record = ORM::factory("author_record")->where("item_id", "=", $item->id)->find();
|
||||||
|
if (!$record->loaded()) {
|
||||||
|
$record->item_id = $item->id;
|
||||||
|
}
|
||||||
|
$record->author = $byline;
|
||||||
|
$record->dirty = 0;
|
||||||
|
$record->save();
|
||||||
|
return $byline;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
48
3.0/modules/author/helpers/author_block.php
Normal file
48
3.0/modules/author/helpers/author_block.php
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 author_block_Core {
|
||||||
|
static function get_site_list() {
|
||||||
|
return array("author" => t("Author"));
|
||||||
|
}
|
||||||
|
|
||||||
|
static function get($block_id, $theme) {
|
||||||
|
$item = $theme->item;
|
||||||
|
if ($block_id != 'author' || $item->is_album() ) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
$record = db::build()
|
||||||
|
->select("author")
|
||||||
|
->from("author_records")
|
||||||
|
->where("item_id", "=", $item->id)
|
||||||
|
->execute()
|
||||||
|
->current();
|
||||||
|
|
||||||
|
$byline = $record->author;
|
||||||
|
if ($byline == '') {
|
||||||
|
$byline = author::fix($item);
|
||||||
|
}
|
||||||
|
|
||||||
|
$block = new Block();
|
||||||
|
$block->content = new View("author_block.html");
|
||||||
|
$block->content->author = $byline;
|
||||||
|
|
||||||
|
return $block;
|
||||||
|
}
|
||||||
|
}
|
32
3.0/modules/author/helpers/author_event.php
Normal file
32
3.0/modules/author/helpers/author_event.php
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 author_event_Core
|
||||||
|
{
|
||||||
|
static function item_created($item) {
|
||||||
|
$byline = author::fix($item);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function item_deleted($item) {
|
||||||
|
db::build()
|
||||||
|
->delete("author_records")
|
||||||
|
->where("item_id", "=", $item->id)
|
||||||
|
->execute();
|
||||||
|
}
|
||||||
|
}
|
64
3.0/modules/author/helpers/author_installer.php
Normal file
64
3.0/modules/author/helpers/author_installer.php
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 author_installer {
|
||||||
|
static function install() {
|
||||||
|
$db = Database::instance();
|
||||||
|
$db->query("CREATE TABLE IF NOT EXISTS {author_records} (
|
||||||
|
`id` int(9) NOT NULL auto_increment,
|
||||||
|
`item_id` INTEGER(9) NOT NULL,
|
||||||
|
`author` TEXT,
|
||||||
|
`dirty` BOOLEAN default 1,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
KEY(`item_id`))
|
||||||
|
DEFAULT CHARSET=utf8;");
|
||||||
|
module::set_version("author", 1);
|
||||||
|
module::set_var("author", "usage_terms", '');
|
||||||
|
module::set_var("author", "credit", '');
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static function activate() {
|
||||||
|
gallery::set_path_env(
|
||||||
|
array(
|
||||||
|
getenv("PATH"),
|
||||||
|
module::get_var("gallery", "extra_binary_paths")
|
||||||
|
));
|
||||||
|
|
||||||
|
$exiv = exec('which exiv2');
|
||||||
|
if ($exiv == '') {
|
||||||
|
# Proper warning
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
module::set_var("author", "exiv_path", $exiv);
|
||||||
|
$out = array();
|
||||||
|
exec("$exiv -V", $out);
|
||||||
|
$parts = split(' ', $out[0]);
|
||||||
|
module::set_var("author", "exiv_version", $parts[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static function deactivate() {
|
||||||
|
}
|
||||||
|
|
||||||
|
static function uninstall() {
|
||||||
|
Database::instance()->query("DROP TABLE IF EXISTS {author_records};");
|
||||||
|
}
|
||||||
|
}
|
21
3.0/modules/author/models/author_record.php
Normal file
21
3.0/modules/author/models/author_record.php
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 Author_Record_Model extends ORM {
|
||||||
|
}
|
3
3.0/modules/author/module.info
Normal file
3
3.0/modules/author/module.info
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
name = "Author"
|
||||||
|
description = "Allows for the display and modification of the Author/Photographer/Byline data in photos."
|
||||||
|
version = 2
|
6
3.0/modules/author/views/author_block.html.php
Normal file
6
3.0/modules/author/views/author_block.html.php
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
|
|
||||||
|
<div class="g-author-block">
|
||||||
|
<?= t('Credit') ?>: <?= html::clean($author) ?>
|
||||||
|
</div>
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.
|
227
3.0/modules/aws_s3/controllers/admin_aws_s3.php
Normal file
227
3.0/modules/aws_s3/controllers/admin_aws_s3.php
Normal file
@ -0,0 +1,227 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
class Admin_Aws_S3_Controller extends Admin_Controller {
|
||||||
|
|
||||||
|
public function index() {
|
||||||
|
$form = $this->_get_s3_form();
|
||||||
|
|
||||||
|
if (request::method() == "post") {
|
||||||
|
access::verify_csrf();
|
||||||
|
|
||||||
|
if (($valid_form = $form->validate()) &&
|
||||||
|
($s3_axs_correct = aws_s3::validate_access_details($_POST['access_key'], $_POST['secret_key'], $_POST['bucket_name']))) {
|
||||||
|
|
||||||
|
// 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", "g3id", $_POST['g3id']);
|
||||||
|
|
||||||
|
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(
|
||||||
|
"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 {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$v = new Admin_View("admin.html");
|
||||||
|
$v->page_title = t("Amazon S3 Configuration");
|
||||||
|
$v->content = new View("admin_aws_s3.html");
|
||||||
|
$v->content->form = $form;
|
||||||
|
$v->content->end = "";
|
||||||
|
|
||||||
|
echo $v;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function _get_s3_form() {
|
||||||
|
$form = new Forge("admin/aws_s3", "", "post", array("id" => "g-admin-s3-form"));
|
||||||
|
|
||||||
|
$group = $form->group("aws_s3")->label(t("Amazon S3 Settings"));
|
||||||
|
|
||||||
|
$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")
|
||||||
|
->label("Access Key ID")
|
||||||
|
->value(module::get_var("aws_s3", "access_key"))
|
||||||
|
->rules("required")
|
||||||
|
->error_messages("required", "This field is required")
|
||||||
|
->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("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")
|
||||||
|
->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")
|
||||||
|
->label("G3 ID")
|
||||||
|
->value(module::get_var("aws_s3", "g3id", md5(time())))
|
||||||
|
->rules("required")
|
||||||
|
->error_messages("required", "This field is required")
|
||||||
|
->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")
|
||||||
|
->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"));
|
||||||
|
|
||||||
|
$group ->input("url_str")
|
||||||
|
->id("s3-url-str")
|
||||||
|
->label("URL String")
|
||||||
|
->value(module::get_var("aws_s3", "url_str", "http://{bucket}.s3.amazonaws.com/g3/{guid}/{resource}"))
|
||||||
|
->rules("required")
|
||||||
|
->message("Configure the URL to access uploaded resources on the CDN. Use the following variables to define and build up the URL:<br />
|
||||||
|
• {bucket} - Bucket Name<br />
|
||||||
|
• {guid} - Unique identifier for this gallery installation<br />
|
||||||
|
• {resource} - The end path to the resource/object");
|
||||||
|
|
||||||
|
$group ->input("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 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");
|
||||||
|
|
||||||
|
|
||||||
|
return $form;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
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..
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
28
3.0/modules/aws_s3/helpers/MY_embedlinks_block.php
Normal file
28
3.0/modules/aws_s3/helpers/MY_embedlinks_block.php
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 embedlinks_block extends embedlinks_block_Core {
|
||||||
|
|
||||||
|
static function get($block_id, $theme) {
|
||||||
|
if ($theme->item && $theme->item->view_1 == 1)
|
||||||
|
parent::get($block_id, $theme);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
31
3.0/modules/aws_s3/helpers/MY_embedlinks_theme.php
Normal file
31
3.0/modules/aws_s3/helpers/MY_embedlinks_theme.php
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 embedlinks_theme extends embedlinks_theme_Core {
|
||||||
|
|
||||||
|
static function photo_bottom($theme) {
|
||||||
|
if (module::get_var("embedlinks", "InPageLinks")) {
|
||||||
|
$item = $theme->item;
|
||||||
|
if ($item->view_1 == 1)
|
||||||
|
return parent::photo_bottom($theme);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
41
3.0/modules/aws_s3/helpers/MY_item.php
Normal file
41
3.0/modules/aws_s3/helpers/MY_item.php
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* 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
|
||||||
|
* 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 extends item_Core {
|
||||||
|
|
||||||
|
static function make_album_cover($item, $sync = false) {
|
||||||
|
if (!$sync)
|
||||||
|
parent::make_album_cover($item);
|
||||||
|
|
||||||
|
$parent = $item->parent();
|
||||||
|
if ($parent->id > 1) {
|
||||||
|
aws_s3::upload_item($parent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static function remove_album_cover($album) {
|
||||||
|
parent::remove_album_cover($album);
|
||||||
|
|
||||||
|
if ($album->id > 1) {
|
||||||
|
aws_s3::remove_item($album);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
330
3.0/modules/aws_s3/helpers/aws_s3.php
Normal file
330
3.0/modules/aws_s3/helpers/aws_s3.php
Normal file
@ -0,0 +1,330 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
|
||||||
|
class aws_s3_Core {
|
||||||
|
|
||||||
|
const UPLOAD_FULLSIZE = 1;
|
||||||
|
const UPLOAD_RESIZE = 2;
|
||||||
|
const UPLOAD_THUMB = 4;
|
||||||
|
|
||||||
|
private static $_s3;
|
||||||
|
|
||||||
|
static function get_s3() {
|
||||||
|
if (!self::$_s3) {
|
||||||
|
require_once(MODPATH . "aws_s3/lib/s3.php");
|
||||||
|
S3::setAuth(module::get_var("aws_s3", "access_key"), module::get_var("aws_s3", "secret_key"));
|
||||||
|
S3::$useSSL = module::get_var("aws_s3", "use_ssl", false);
|
||||||
|
}
|
||||||
|
return self::$_s3;
|
||||||
|
}
|
||||||
|
|
||||||
|
static function getHash($string) {
|
||||||
|
return base64_encode(extension_loaded('hash') ?
|
||||||
|
hash_hmac('sha1', $string, module::get_var("aws_s3", "secret_key"), true) : pack('H*', sha1(
|
||||||
|
(str_pad(module::get_var("aws_s3", "secret_key"), 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) .
|
||||||
|
pack('H*', sha1((str_pad(module::get_var("aws_s3", "secret_key"), 64, chr(0x00)) ^
|
||||||
|
(str_repeat(chr(0x36), 64))) . $string)))));
|
||||||
|
}
|
||||||
|
|
||||||
|
static function generate_url($resource, $authenticated = false, $updated = null) {
|
||||||
|
$find = array("{guid}", "{bucket}", "{resource}");
|
||||||
|
$replace = array(module::get_var("aws_s3", "g3id"), module::get_var("aws_s3", "bucket_name"), $resource);
|
||||||
|
$url = str_replace($find, $replace, module::get_var("aws_s3", "url_str"));
|
||||||
|
|
||||||
|
if ($authenticated) {
|
||||||
|
preg_match("%https?://([a-zA-Z0-9\.-]*)/(.*)$%", $url, $matches);
|
||||||
|
$host = module::get_var("aws_s3" , "bucket_name");
|
||||||
|
$resource = $matches[2];
|
||||||
|
$url .= "?AWSAccessKeyId=" . module::get_var("aws_s3", "access_key") .
|
||||||
|
"&Expires=" . (time() + module::get_var("aws_s3", "sig_exp")) .
|
||||||
|
"&Signature=" . urlencode(self::getHash("GET\n\n\n" . (time() + module::get_var("aws_s3", "sig_exp")) . "\n/" . $host . "/" . $resource));
|
||||||
|
|
||||||
|
self::get_s3();
|
||||||
|
S3::getAuthenticatedURL(module::get_var("aws_s3", "bucket_name"), $resource, module::get_var("aws_s3", "sig_exp"));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$url .= "?m=" . ($updated ? $updated : time());
|
||||||
|
|
||||||
|
return $url;
|
||||||
|
}
|
||||||
|
|
||||||
|
static function get_resource_url($resource) {
|
||||||
|
$url = self::generate_url($resource);
|
||||||
|
preg_match("%https?://[\w\.\-]*/(.*)\?%", $url, $matches);
|
||||||
|
if (count($matches) > 0)
|
||||||
|
return $matches[1];
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static function log($item) {
|
||||||
|
if (is_string($item) || is_numeric($item)) {}
|
||||||
|
else
|
||||||
|
$item = print_r($item, true);
|
||||||
|
|
||||||
|
$fh = fopen(VARPATH . "modules/aws_s3/log/aws_s3-" . date("Y-m-d") . ".log", "a");
|
||||||
|
fwrite($fh, date("Y-m-d H:i:s") . ": " . $item . "\n");
|
||||||
|
fclose($fh);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function get_upload_flags() {
|
||||||
|
$flags = 0;
|
||||||
|
if (module::get_var("aws_s3", "upload_thumbs") == 1)
|
||||||
|
$flags += self::UPLOAD_THUMB;
|
||||||
|
if (module::get_var("aws_s3", "upload_resizes") == 1)
|
||||||
|
$flags += self::UPLOAD_RESIZE;
|
||||||
|
if (module::get_var("aws_s3", "upload_fullsizes") == 1)
|
||||||
|
$flags += self::UPLOAD_FULLSIZE;
|
||||||
|
return $flags;
|
||||||
|
}
|
||||||
|
|
||||||
|
static function upload_item($item, $flags = 7) {
|
||||||
|
self::get_s3();
|
||||||
|
|
||||||
|
$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();
|
||||||
|
|
||||||
|
$old_filename = urldecode($old_item->relative_path());
|
||||||
|
$new_filename = urldecode($new_item->relative_path());
|
||||||
|
|
||||||
|
aws_s3::log("old filename: " . self::get_resource_url("fs/" . $old_filename) . ", " .
|
||||||
|
"new filename: " . self::get_resource_url("fs/" . $new_filename));
|
||||||
|
|
||||||
|
//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();
|
||||||
|
|
||||||
|
$filename = urldecode($item->relative_path());
|
||||||
|
$itype = "I";
|
||||||
|
if ($item->is_album()) {
|
||||||
|
$filename .= "/.album.jpg";
|
||||||
|
$itype = "A";
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
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 ($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_fs && $success_th && $success_rs;
|
||||||
|
aws_s3::log("S3 delete success: " . $success);
|
||||||
|
return $success;
|
||||||
|
}
|
||||||
|
|
||||||
|
static function getAuthenticatedURL($bucket, $uri) {
|
||||||
|
self::get_s3();
|
||||||
|
|
||||||
|
return S3::getAuthenticatedURL($bucket, $uri, 60);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function validate_number($field) {
|
||||||
|
if (preg_match("/\D/", $field->value))
|
||||||
|
$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);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
56
3.0/modules/aws_s3/helpers/aws_s3_event.php
Normal file
56
3.0/modules/aws_s3/helpers/aws_s3_event.php
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
|
||||||
|
class aws_s3_event_Core {
|
||||||
|
|
||||||
|
static function admin_menu($menu, $theme) {
|
||||||
|
$menu
|
||||||
|
->get("settings_menu")
|
||||||
|
->append(
|
||||||
|
Menu::factory("link")
|
||||||
|
->id("aws_s3_link")
|
||||||
|
->label(t("Amazon S3"))
|
||||||
|
->url(url::site("admin/aws_s3"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function item_created($item) {
|
||||||
|
if ($item->id == 1)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
aws_s3::log("Item created - " . $item->id);
|
||||||
|
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_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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
126
3.0/modules/aws_s3/helpers/aws_s3_installer.php
Normal file
126
3.0/modules/aws_s3/helpers/aws_s3_installer.php
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
|
||||||
|
class aws_s3_installer {
|
||||||
|
|
||||||
|
static function install() {
|
||||||
|
self::upgrade(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function uninstall() {
|
||||||
|
dir::unlink(VARPATH . "modules/aws_s3");
|
||||||
|
Database::instance()->query("DROP TABLE {aws_s3_meta}");
|
||||||
|
}
|
||||||
|
|
||||||
|
static function upgrade($version) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
193
3.0/modules/aws_s3/helpers/aws_s3_task.php
Normal file
193
3.0/modules/aws_s3/helpers/aws_s3_task.php
Normal file
@ -0,0 +1,193 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
|
||||||
|
class aws_s3_task_Core {
|
||||||
|
|
||||||
|
static function available_tasks() {
|
||||||
|
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, aws_s3::get_upload_flags())) {
|
||||||
|
$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, aws_s3::get_upload_flags());
|
||||||
|
$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) {
|
||||||
|
aws_s3::log("Amazon S3 Re-sync task started..");
|
||||||
|
|
||||||
|
batch::start();
|
||||||
|
$items = ORM::factory("item")->find_all();
|
||||||
|
|
||||||
|
$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, aws_s3::get_upload_flags());
|
||||||
|
}
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
1367
3.0/modules/aws_s3/lib/s3.php
Normal file
1367
3.0/modules/aws_s3/lib/s3.php
Normal file
File diff suppressed because it is too large
Load Diff
90
3.0/modules/aws_s3/models/MY_Item_Model.php
Normal file
90
3.0/modules/aws_s3/models/MY_Item_Model.php
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
|
|
||||||
|
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")|| Router::$controller == "rest" || !$this->s3_thumb_uploaded)
|
||||||
|
return parent::thumb_url($full_uri);
|
||||||
|
|
||||||
|
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)
|
||||||
|
return aws_s3::generate_url("th/" . $this->relative_path() . "/.album.jpg", ($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") || 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") || Router::$controller == "rest" || !$this->s3_resize_uploaded)
|
||||||
|
return parent::resize_url($full_uri);
|
||||||
|
|
||||||
|
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 {
|
||||||
|
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;
|
||||||
|
}
|
3
3.0/modules/aws_s3/module.info
Normal file
3
3.0/modules/aws_s3/module.info
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
name = "Amazon S3"
|
||||||
|
description = "Seamlessly transfer your Gallery data to Amazon S3 CDN for a lightning fast gallery"
|
||||||
|
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
|
16
3.0/modules/aws_s3/views/admin_aws_s3.html.php
Normal file
16
3.0/modules/aws_s3/views/admin_aws_s3.html.php
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<?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>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?php echo $end; ?>
|
@ -20,7 +20,7 @@
|
|||||||
class basket_theme_Core {
|
class basket_theme_Core {
|
||||||
|
|
||||||
static function head($theme) {
|
static function head($theme) {
|
||||||
$theme->css("basket.css");
|
return $theme->css("basket.css");
|
||||||
}
|
}
|
||||||
|
|
||||||
static function header_top($theme) {
|
static function header_top($theme) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -25,42 +25,93 @@ class BatchTag_Controller extends Controller {
|
|||||||
access::verify_csrf();
|
access::verify_csrf();
|
||||||
|
|
||||||
$input = Input::instance();
|
$input = Input::instance();
|
||||||
|
url::redirect(url::abs_site("batchtag/tagitems2?name={$input->post('name')}&item_id={$input->post('item_id')}&tag_subitems={$input->post('tag_subitems')}&csrf={$input->post('csrf')}"));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tagitems2() {
|
||||||
|
// Tag all non-album items in the current album with the specified tags.
|
||||||
|
|
||||||
|
// Prevent Cross Site Request Forgery
|
||||||
|
access::verify_csrf();
|
||||||
|
|
||||||
|
$input = Input::instance();
|
||||||
|
|
||||||
|
// Variables
|
||||||
|
if (($input->get("batchtag_max") == false) || ($input->get("batchtag_max") == "0")) {
|
||||||
|
$batchtag_max = "50";
|
||||||
|
} else {
|
||||||
|
$batchtag_max = $input->get("batchtag_max");
|
||||||
|
}
|
||||||
|
if ($input->get("batchtag_items_processed") == false) {
|
||||||
|
$batchtag_items_processed = "0";
|
||||||
|
} else {
|
||||||
|
$batchtag_items_processed = $input->get("batchtag_items_processed");
|
||||||
|
}
|
||||||
|
|
||||||
// Figure out if the contents of sub-albums should also be tagged
|
// Figure out if the contents of sub-albums should also be tagged
|
||||||
$str_tag_subitems = $input->post("tag_subitems");
|
$str_tag_subitems = $input->get("tag_subitems");
|
||||||
|
|
||||||
$children = "";
|
$children = "";
|
||||||
if ($str_tag_subitems == false) {
|
if ($str_tag_subitems == false) {
|
||||||
// Generate an array of all non-album items in the current album.
|
// Generate an array of all non-album items in the current album.
|
||||||
$children = ORM::factory("item")
|
$children = ORM::factory("item")
|
||||||
->where("parent_id", "=", $input->post("item_id"))
|
->where("parent_id", "=", $input->get("item_id"))
|
||||||
->where("type", "!=", "album")
|
->where("type", "!=", "album")
|
||||||
->find_all();
|
->find_all();
|
||||||
} else {
|
} else {
|
||||||
// Generate an array of all non-album items in the current album
|
// Generate an array of all non-album items in the current album
|
||||||
// and any sub albums.
|
// and any sub albums.
|
||||||
$item = ORM::factory("item", $input->post("item_id"));
|
$item = ORM::factory("item", $input->get("item_id"));
|
||||||
$children = $item->descendants();
|
$children = $item->descendants();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Loop through each item in the album and make sure the user has
|
// Loop through each item in the album and make sure the user has
|
||||||
// access to view and edit it.
|
// access to view and edit it.
|
||||||
|
$children_count = "0";
|
||||||
|
$tag_count = "0";
|
||||||
|
|
||||||
|
//echo Kohana::debug($children);
|
||||||
|
|
||||||
|
echo '<style>.continue { margin: 5em auto; text-align: center; }</style>';
|
||||||
|
|
||||||
foreach ($children as $child) {
|
foreach ($children as $child) {
|
||||||
|
|
||||||
|
if ($tag_count < $batchtag_max) {
|
||||||
|
|
||||||
|
if ($children_count >= $batchtag_items_processed) {
|
||||||
if (access::can("view", $child) && access::can("edit", $child) && !$child->is_album()) {
|
if (access::can("view", $child) && access::can("edit", $child) && !$child->is_album()) {
|
||||||
|
|
||||||
// Assuming the user can view/edit the current item, loop
|
// Assuming the user can view/edit the current item, loop
|
||||||
// through each tag that was submitted and apply it to
|
// through each tag that was submitted and apply it to
|
||||||
// the current item.
|
// the current item.
|
||||||
foreach (explode(",", $input->post("name")) as $tag_name) {
|
foreach (explode(",", $input->get("name")) as $tag_name) {
|
||||||
$tag_name = trim($tag_name);
|
$tag_name = trim($tag_name);
|
||||||
if ($tag_name) {
|
if ($tag_name) {
|
||||||
tag::add($child, $tag_name);
|
tag::add($child, $tag_name);
|
||||||
}
|
}
|
||||||
|
// $tag_count should be inside the foreach loop as it is depending on the number of time tag:add is run
|
||||||
|
$tag_count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
echo '<style>.c' . $children_count . ' { display:none; }</style>' . "\n";
|
||||||
|
$children_count++;
|
||||||
|
$batchtag_max_new = $tag_count;
|
||||||
|
echo '<div class="continue c' . $children_count . '"><a href="' . url::abs_site("batchtag/tagitems2?name={$input->get('name')}&item_id={$input->get('item_id')}&tag_subitems={$input->get('tag_subitems')}&batchtag_items_processed=$children_count&batchtag_max=$batchtag_max_new&csrf={$input->get('csrf')}") . '">Continue</a></div>';
|
||||||
|
} else { $children_count++; }
|
||||||
|
|
||||||
|
} else { break; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($tag_count < $batchtag_max) {
|
||||||
// Redirect back to the album.
|
// Redirect back to the album.
|
||||||
$item = ORM::factory("item", $input->post("item_id"));
|
$item = ORM::factory("item", $input->get("item_id"));
|
||||||
url::redirect(url::abs_site("{$item->type}s/{$item->id}"));
|
url::redirect(url::abs_site("{$item->type}s/{$item->id}"));
|
||||||
|
//echo url::abs_site("{$item->type}s/{$item->id}");
|
||||||
|
} else {
|
||||||
|
url::redirect(url::abs_site("batchtag/tagitems2?name={$input->get('name')}&item_id={$input->get('item_id')}&tag_subitems={$input->get('tag_subitems')}&batchtag_items_processed=$children_count&batchtag_max=$batchtag_max&csrf={$input->get('csrf')}"));
|
||||||
|
//echo url::abs_site("batchtag/tagitems2?name={$input->get('name')}&item_id={$input->get('item_id')}&tag_subitems={$input->get('tag_subitems')}&batchtag_items_processed=$children_count&batchtag_max=$batchtag_max&csrf={$input->get('csrf')}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -20,6 +20,6 @@
|
|||||||
class calendarview_theme_Core {
|
class calendarview_theme_Core {
|
||||||
|
|
||||||
static function head($theme) {
|
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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -30,6 +30,18 @@ class Captionator_Controller extends Controller {
|
|||||||
$v = new Theme_View("page.html", "collection", "captionator");
|
$v = new Theme_View("page.html", "collection", "captionator");
|
||||||
$v->content = new View("captionator_dialog.html");
|
$v->content = new View("captionator_dialog.html");
|
||||||
$v->content->album = $album;
|
$v->content->album = $album;
|
||||||
|
$v->content->enable_tags = module::is_active("tag");
|
||||||
|
if ($v->content->enable_tags) {
|
||||||
|
$v->content->tags = array();
|
||||||
|
foreach ($album->viewable()->children() as $child) {
|
||||||
|
$item = ORM::factory("item", $child->id);
|
||||||
|
$tag_names = array();
|
||||||
|
foreach (tag::item_tags($item) as $tag) {
|
||||||
|
$tag_names[] = $tag->name;
|
||||||
|
}
|
||||||
|
$v->content->tags[$child->id] = implode(", ", $tag_names);
|
||||||
|
}
|
||||||
|
}
|
||||||
print $v;
|
print $v;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,12 +54,27 @@ class Captionator_Controller extends Controller {
|
|||||||
if (Input::instance()->post("save")) {
|
if (Input::instance()->post("save")) {
|
||||||
$titles = Input::instance()->post("title");
|
$titles = Input::instance()->post("title");
|
||||||
$descriptions = Input::instance()->post("description");
|
$descriptions = Input::instance()->post("description");
|
||||||
|
$filenames = Input::instance()->post("filename");
|
||||||
|
$internetaddresses = Input::instance()->post("internetaddress");
|
||||||
|
$tags = Input::instance()->post("tags");
|
||||||
|
$enable_tags = module::is_active("tag");
|
||||||
foreach (array_keys($titles) as $id) {
|
foreach (array_keys($titles) as $id) {
|
||||||
$item = ORM::factory("item", $id);
|
$item = ORM::factory("item", $id);
|
||||||
if ($item->loaded() && access::can("edit", $item)) {
|
if ($item->loaded() && access::can("edit", $item)) {
|
||||||
$item->title = $titles[$id];
|
$item->title = $titles[$id];
|
||||||
$item->description = $descriptions[$id];
|
$item->description = $descriptions[$id];
|
||||||
|
$item->name = $filenames[$id];
|
||||||
|
$item->slug = $internetaddresses[$id];
|
||||||
$item->save();
|
$item->save();
|
||||||
|
if ($enable_tags) {
|
||||||
|
tag::clear_all($item);
|
||||||
|
foreach (explode(",", $tags[$id]) as $tag_name) {
|
||||||
|
if ($tag_name) {
|
||||||
|
tag::add($item, trim($tag_name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tag::compact();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
message::success(t("Captions saved"));
|
message::success(t("Captions saved"));
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,5 +1,11 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
<div id="g-captionator-dialog">
|
<div id="g-captionator-dialog">
|
||||||
|
<script type="text/javascript">
|
||||||
|
$('form input[name^=tags]').ready(function() {
|
||||||
|
$('form input[name^=tags]').autocomplete(
|
||||||
|
'/tags/autocomplete', {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
<form action="<?= url::site("captionator/save/{$album->id}") ?>" method="post" id="g-captionator-form">
|
<form action="<?= url::site("captionator/save/{$album->id}") ?>" method="post" id="g-captionator-form">
|
||||||
<?= access::csrf_form_field() ?>
|
<?= access::csrf_form_field() ?>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@ -23,6 +29,20 @@
|
|||||||
<label for="description[<?= $child->id ?>]"> <?= t("Description") ?> </label>
|
<label for="description[<?= $child->id ?>]"> <?= t("Description") ?> </label>
|
||||||
<textarea style="height: 5em" name="description[<?= $child->id ?>]"><?= $child->description ?></textarea>
|
<textarea style="height: 5em" name="description[<?= $child->id ?>]"><?= $child->description ?></textarea>
|
||||||
</li>
|
</li>
|
||||||
|
<? if ($enable_tags): ?>
|
||||||
|
<li>
|
||||||
|
<label for="tags[<?= $child->id ?>]"> <?= t("Tags (comma separated)") ?> </label>
|
||||||
|
<input type="text" name="tags[<?= $child->id ?>]" class="ac_input" autocomplete="off" value="<?= $tags[$child->id] ?>"/>
|
||||||
|
</li>
|
||||||
|
<? endif ?>
|
||||||
|
<li>
|
||||||
|
<label for="filename[<?= $child->id ?>]"> <?= t("Filename") ?> </label>
|
||||||
|
<input type="text" name="filename[<?= $child->id ?>]" class="ac_input" autocomplete="off" value="<?= $child->name ?>"/>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<label for="internetaddress[<?= $child->id ?>]"> <?= t("Internet Address") ?> </label>
|
||||||
|
<input type="text" name="internetaddress[<?= $child->id ?>]" class="ac_input" autocomplete="off" value="<?= $child->slug ?>"/>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.\");" ?>
|
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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
|
* 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
|
* 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
|
* 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.\");" ?>
|
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.\");" ?>
|
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.\");" ?>
|
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.\");" ?>
|
<?= "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");" ?>
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* Gallery - a web based photo album viewer and editor
|
||||||
* Copyright (C) 2000-2009 Bharat Mediratta
|
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -17,27 +17,21 @@
|
|||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
class exif_event_Core {
|
class displaytags_event_Core {
|
||||||
static function item_created($item) {
|
static function pre_deactivate($data) {
|
||||||
if (!$item->is_album()) {
|
if ($data->module == "tag") {
|
||||||
exif::extract($item);
|
$data->messages["warn"][] = t("The DisplayTags module requires the Tags module.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static function item_deleted($item) {
|
static function module_change($changes) {
|
||||||
db::build()
|
if (!module::is_active("tag") || in_array("tag", $changes->deactivate)) {
|
||||||
->delete("exif_records")
|
site_status::warning(
|
||||||
->where("item_id", "=", $item->id)
|
t("The DisplayTags module requires the Tags module. <a href=\"%url\">Activate the Tags module now</a>",
|
||||||
->execute();
|
array("url" => html::mark_clean(url::site("admin/modules")))),
|
||||||
|
"displaytags_needs_tag");
|
||||||
|
} else {
|
||||||
|
site_status::clear("displaytags_needs_tag");
|
||||||
}
|
}
|
||||||
|
|
||||||
static function photo_menu($menu, $theme) {
|
|
||||||
$item = $theme->item();
|
|
||||||
$menu->append(
|
|
||||||
Menu::factory("link")
|
|
||||||
->id("exifdata-link")
|
|
||||||
->label(t("Photo Details"))
|
|
||||||
->url(url::site("exif/show/$item->id"))
|
|
||||||
->css_id("g-exifdata-link"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* GreyDragon Theme - a theme for Menalto Gallery 3
|
* Gallery - a web based photo album viewer and editor
|
||||||
* Copyright (C) 2009-2010 Serguei Dosyukov
|
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -17,14 +17,20 @@
|
|||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
class greydragon_installer {
|
class displaytags_installer {
|
||||||
static function install() {
|
static function install() {
|
||||||
site_status::warning(t("Initial configuration for the theme may be required. Visit Admin\Appearance\Theme Options before continue."), "gd_init_configuration");
|
module::set_version("displaytags", 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static function deactivate() {
|
static function deactivate() {
|
||||||
site_status::clear("gd_init_configuration");
|
site_status::clear("displaytags_needs_tag");
|
||||||
|
}
|
||||||
|
|
||||||
|
static function can_activate() {
|
||||||
|
$messages = array();
|
||||||
|
if (!module::is_active("tag")) {
|
||||||
|
$messages["warn"][] = t("The DisplayTags module requires the Tags module.");
|
||||||
|
}
|
||||||
|
return $messages;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -174,7 +174,8 @@ class downloadalbum_Controller extends Controller {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$i_relative_path = str_replace($container_realpath.'/', '', $i_realpath);
|
$i_relative_path = str_replace($container_realpath.DIRECTORY_SEPARATOR, '', $i_realpath);
|
||||||
|
$i_relative_path = str_replace(DIRECTORY_SEPARATOR, '/', $i_relative_path);
|
||||||
$files[$i_relative_path] = $i_realpath;
|
$files[$i_relative_path] = $i_realpath;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -287,9 +288,13 @@ class downloadalbum_Controller extends Controller {
|
|||||||
* See http://bugs.php.net/bug.php?id=45028
|
* See http://bugs.php.net/bug.php?id=45028
|
||||||
*/
|
*/
|
||||||
private function fixBug45028($hash) {
|
private function fixBug45028($hash) {
|
||||||
return (version_compare(PHP_VERSION, '5.2.7', '<'))
|
$output = $hash;
|
||||||
? (($hash & 0x000000ff) << 24) + (($hash & 0x0000ff00) << 8)
|
|
||||||
+ (($hash & 0x00ff0000) >> 8) + (($hash & 0xff000000) >> 24)
|
if( version_compare(PHP_VERSION, '5.2.7', '<') ) {
|
||||||
: $hash;
|
$str = str_pad(dechex($hash), 8, '0', STR_PAD_LEFT);
|
||||||
|
$output = hexdec($str{6}.$str{7}.$str{4}.$str{5}.$str{2}.$str{3}.$str{0}.$str{1});
|
||||||
|
}
|
||||||
|
|
||||||
|
return $output;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* 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.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -19,6 +19,6 @@
|
|||||||
*/
|
*/
|
||||||
class downloadalbum_theme {
|
class downloadalbum_theme {
|
||||||
static function head($theme) {
|
static function head($theme) {
|
||||||
$theme->css("downloadalbum_menu.css");
|
return $theme->css("downloadalbum_menu.css");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user