Compare commits
66 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
81a66d2676 | ||
|
f36235d64e | ||
|
ac0086cab6 | ||
|
95357d5c63 | ||
|
173f74cec6 | ||
|
edc54fb80d | ||
|
1a0448afc1 | ||
|
f090414dc8 | ||
|
3c932e6294 | ||
|
013caee157 | ||
|
1bc343fe5a | ||
|
e7c0716a67 | ||
|
1235bfe0de | ||
|
fa55cd636b | ||
|
52503dfebf | ||
|
8be1c614f1 | ||
|
87dca0e2c1 | ||
|
b38cfc0c5f | ||
|
cbfcef3813 | ||
|
b5268d17e9 | ||
|
cc29ef4bb2 | ||
|
a68beced0e | ||
|
de7bfd65d5 | ||
|
df3366a46c | ||
|
4de4662618 | ||
|
a257a159df | ||
|
bc39e57ba0 | ||
|
11b0bee935 | ||
|
987015fcff | ||
|
b46f6caee6 | ||
|
be13679611 | ||
|
837b98a1a7 | ||
|
a462db4c4a | ||
|
1211f6c67b | ||
|
63ecd7febf | ||
|
cdd87dff72 | ||
|
e69a09d076 | ||
|
d6e72cbe10 | ||
|
4c46f821f0 | ||
|
81a6c52032 | ||
|
1abb52c99a | ||
|
61cf2b9150 | ||
|
e3cb17e173 | ||
|
da55487653 | ||
|
f158fa8147 | ||
|
fbea04afed | ||
|
51d8a79ce3 | ||
|
e574ff6413 | ||
|
e8c2b9501e | ||
|
c881e1ea40 | ||
|
16d3b73034 | ||
|
9795535fe4 | ||
|
706f53bde5 | ||
|
bdf7d23138 | ||
|
fd79e8d5f6 | ||
|
3f4e48b3dc | ||
|
7a1fa2026a | ||
|
72d4c5f4c8 | ||
|
6e0cf197d1 | ||
|
57a40c139a | ||
|
568a2a53ff | ||
|
d592353384 | ||
|
50a5c18b36 | ||
|
296da8131f | ||
|
7a422d82c5 | ||
|
9553bab5c6 |
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
test.pl
|
||||
test.sh
|
679
COPYING
679
COPYING
@ -1,13 +1,674 @@
|
||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
Version 2, December 2004
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
|
||||
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.
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim or modified
|
||||
copies of this license document, and changing it is allowed as long
|
||||
as the name is changed.
|
||||
Preamble
|
||||
|
||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
0. You just DO WHAT THE FUCK YOU WANT TO.
|
||||
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>.
|
||||
|
25
II/Config.pm
25
II/Config.pm
@ -5,32 +5,47 @@ use Config::Tiny;
|
||||
sub new {
|
||||
my $class = shift;
|
||||
|
||||
my $c = Config::Tiny->new();
|
||||
$c = Config::Tiny->read('config.ini');
|
||||
|
||||
my $self = { _config => $c, };
|
||||
my $self = { _file => 'config.ini', };
|
||||
|
||||
bless $self, $class;
|
||||
return $self;
|
||||
}
|
||||
|
||||
# Load configuration
|
||||
sub load {
|
||||
my ($self) = @_;
|
||||
my $config = $self->{_config};
|
||||
my $file = $self->{_file};
|
||||
|
||||
my $tiny = Config::Tiny->new();
|
||||
$config = $tiny->read($file);
|
||||
|
||||
my $key = $config->{auth}->{key};
|
||||
my $nick = $config->{auth}->{nick};
|
||||
my $host = $config->{node}->{host};
|
||||
my @echoareas = split /,/, $config->{node}->{echoareas};
|
||||
my $name = $config->{node}->{name};
|
||||
my $notify = $config->{notify}->{enabled};
|
||||
|
||||
$c = {
|
||||
nick => $nick,
|
||||
key => $key,
|
||||
host => $host,
|
||||
echoareas => [@echoareas],
|
||||
name => $name,
|
||||
notify => $notify,
|
||||
};
|
||||
|
||||
return $c;
|
||||
}
|
||||
|
||||
# Reload configuration
|
||||
sub reload {
|
||||
my ($self) = @_;
|
||||
|
||||
my $c = II::Config->new();
|
||||
my $config = $c->load();
|
||||
|
||||
return $config;
|
||||
}
|
||||
|
||||
1;
|
||||
|
86
II/DB.pm
86
II/DB.pm
@ -2,6 +2,7 @@ package II::DB;
|
||||
|
||||
use SQL::Abstract;
|
||||
use DBI;
|
||||
use utf8;
|
||||
|
||||
use Data::Dumper;
|
||||
|
||||
@ -20,25 +21,26 @@ sub new {
|
||||
return $self;
|
||||
}
|
||||
|
||||
# Check message hash
|
||||
sub check_hash {
|
||||
my ( $self, $hash, $echo ) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
|
||||
my $q = "select hash from echo where hash='$hash' and echo='$echo'";
|
||||
my $q = "select hash from echo where hash='$hash' and echo='$echo'";
|
||||
my $sth = $dbh->prepare($q);
|
||||
$sth->execute();
|
||||
|
||||
while ( my @h = $sth->fetchrow_array() ) {
|
||||
my ($base_hash) = @h;
|
||||
if ($hash eq $base_hash) {
|
||||
if ( $hash eq $base_hash ) {
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Begin transaction
|
||||
sub begin {
|
||||
my ($self) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
@ -47,6 +49,7 @@ sub begin {
|
||||
$dbh->do('BEGIN');
|
||||
}
|
||||
|
||||
# Commit transaction
|
||||
sub commit {
|
||||
my ($self) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
@ -80,6 +83,16 @@ sub write_out {
|
||||
print "Message writed to DB!\n";
|
||||
}
|
||||
|
||||
sub del_out {
|
||||
my ( $self, $hash ) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
|
||||
my $q = "delete from output where hash='$hash' and send=0";
|
||||
my $sth = $dbh->prepare($q);
|
||||
$sth->execute();
|
||||
$sth->finish();
|
||||
}
|
||||
|
||||
sub update_out {
|
||||
my ( $self, $hash ) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
@ -153,6 +166,35 @@ sub select_subg {
|
||||
|
||||
}
|
||||
|
||||
# Select user messages
|
||||
sub select_user {
|
||||
my ( $self, $user ) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
|
||||
my $q
|
||||
= "select from_user, to_user, subg, time, echo, post, hash from messages where from_user='$user' order by time desc";
|
||||
|
||||
my $sth = $dbh->prepare($q);
|
||||
$sth->execute();
|
||||
|
||||
my @posts;
|
||||
while ( my @hash = $sth->fetchrow_array() ) {
|
||||
my ( $from, $to, $subg, $time, $echo, $post, $h ) = @hash;
|
||||
my $data = {
|
||||
from => "$from",
|
||||
to => "$to",
|
||||
subg => "$subg",
|
||||
time => $time,
|
||||
echo => "$echo",
|
||||
post => "$post",
|
||||
hash => $h,
|
||||
};
|
||||
push( @posts, $data );
|
||||
}
|
||||
|
||||
return @posts;
|
||||
}
|
||||
|
||||
sub from_me {
|
||||
my ( $self, $config ) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
@ -233,7 +275,7 @@ sub echoes {
|
||||
time => $time,
|
||||
echo => "$echo",
|
||||
post => "$post",
|
||||
h => $h,
|
||||
hash => $h,
|
||||
};
|
||||
push( @posts, $data );
|
||||
}
|
||||
@ -250,7 +292,7 @@ sub to_me {
|
||||
# print "NICK: $nick\n";
|
||||
|
||||
my $q
|
||||
= "select from_user, to_user, subg, time, echo, post, hash from messages where to_user='$nick'";
|
||||
= "select from_user, to_user, subg, time, echo, post, hash from messages where to_user='$nick' order by time desc";
|
||||
|
||||
my $sth = $dbh->prepare($q);
|
||||
$sth->execute();
|
||||
@ -301,4 +343,36 @@ sub select_new {
|
||||
return $data;
|
||||
}
|
||||
|
||||
# Search
|
||||
sub do_search {
|
||||
my ( $self, $query ) = @_;
|
||||
my $dbh = $self->{_dbh};
|
||||
|
||||
my $q = "select from_user, to_user, subg, time, echo, post, hash
|
||||
from messages where subg
|
||||
like '\%$query\%' COLLATE NOCASE
|
||||
order by time";
|
||||
|
||||
print "SQL: " . $q . "\n";
|
||||
my $sth = $dbh->prepare($q);
|
||||
$sth->execute();
|
||||
|
||||
my @posts;
|
||||
while ( my @hash = $sth->fetchrow_array() ) {
|
||||
my ( $from, $to, $subg, $time, $echo, $post, $h ) = @hash;
|
||||
my $data = {
|
||||
from => "$from",
|
||||
to => "$to",
|
||||
subg => "$subg",
|
||||
time => $time,
|
||||
echo => "$echo",
|
||||
post => "$post",
|
||||
hash => "$h",
|
||||
};
|
||||
push( @posts, $data );
|
||||
}
|
||||
|
||||
return @posts;
|
||||
}
|
||||
|
||||
1;
|
||||
|
14
II/Enc.pm
14
II/Enc.pm
@ -21,11 +21,7 @@ sub new {
|
||||
sub decrypt {
|
||||
my ( $self, $base64 ) = @_;
|
||||
|
||||
# Decrypt message
|
||||
my $dec = decode_base64($base64);
|
||||
# my $dec = `echo "$base64" | base64 -d`;
|
||||
|
||||
return $dec;
|
||||
return decode_base64($base64);
|
||||
}
|
||||
|
||||
sub encode {
|
||||
@ -42,10 +38,14 @@ sub encode {
|
||||
$message .= '@repto:' . $data->{hash} . "\n" if defined( $data->{hash} );
|
||||
$message .= $data->{post};
|
||||
|
||||
my $encoded = `echo "$message" | base64`;
|
||||
# my $encoded = `echo "$message" | base64`;
|
||||
my $encoded = encode_base64($message);
|
||||
$encoded =~ s/\//_/g;
|
||||
$encoded =~ s/\+/-/g;
|
||||
|
||||
# Preparsing
|
||||
my $post = II::T->in_pre($data->{post});
|
||||
|
||||
# Make data
|
||||
my %out = (
|
||||
hash => $hash,
|
||||
@ -54,7 +54,7 @@ sub encode {
|
||||
from_user => $data->{from},
|
||||
to_user => $data->{to},
|
||||
subg => $data->{subg},
|
||||
post => $data->{post},
|
||||
post => $post,
|
||||
base64 => $encoded,
|
||||
send => 0,
|
||||
);
|
||||
|
37
II/Get.pm
37
II/Get.pm
@ -68,45 +68,26 @@ sub get_echo {
|
||||
}
|
||||
}
|
||||
else {
|
||||
print $res->status_line, "\n";
|
||||
print $res_echo->status_line, "\n";
|
||||
}
|
||||
$db->commit();
|
||||
|
||||
# Make new messages url
|
||||
# my $new_messages_url = "$host$msg_url";
|
||||
# my $count = 0;
|
||||
# while ( $count < @new ) {
|
||||
# $new_messages_url .= $new[$count]->{hash} . "/";
|
||||
# $count++;
|
||||
# }
|
||||
|
||||
# Get messages
|
||||
my @msg_con;
|
||||
# Get messages and populate hash
|
||||
my $count = 0;
|
||||
while ( $count < @new ) {
|
||||
my $new_messages_url = "$host$msg_url" . $new[$count]->{hash};
|
||||
my $req_msg = HTTP::Request->new( GET => $new_messages_url );
|
||||
my $res_msg = $ua->request($req_msg);
|
||||
|
||||
if ( $res_msg->is_success() ) {
|
||||
push( @msg_con, $res_msg->content() );
|
||||
my ( $hash, $m ) = split(':', $res_msg->content());
|
||||
push( @messages_hash, { hash => $hash, base64 => $m } );
|
||||
}
|
||||
else {
|
||||
print $res->status_line, "\n";
|
||||
print $res_msg->status_line, "\n";
|
||||
}
|
||||
$count++;
|
||||
}
|
||||
|
||||
# Populate hash
|
||||
while (<@msg_con>) {
|
||||
my @message = split /:/, $_;
|
||||
if ( defined( $message[1] ) ) {
|
||||
my $h = {
|
||||
hash => $message[0],
|
||||
base64 => $message[1],
|
||||
};
|
||||
push( @messages_hash, $h );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
my $new_messages
|
||||
@ -164,6 +145,12 @@ sub get_echo {
|
||||
# Commit transaction
|
||||
$db->commit();
|
||||
print localtime() . ": messages writed to DB!\n";
|
||||
|
||||
# Notify
|
||||
my @notify_cmd = ('notify-send', 'Сеть ii', 'Есть новые сообщения');
|
||||
if ($notify == 1) {
|
||||
system(@notify_cmd) == 0 or warn "Cannot send notify: $!\n";
|
||||
}
|
||||
}
|
||||
return $msgs;
|
||||
}
|
||||
|
122
II/Render.pm
122
II/Render.pm
@ -8,12 +8,15 @@ use Data::Dumper;
|
||||
sub new {
|
||||
my $class = shift;
|
||||
|
||||
my $db = II::DB->new();
|
||||
my $t = II::T->new();
|
||||
my $db = II::DB->new();
|
||||
my $t = II::T->new();
|
||||
my $c = II::Config->new();
|
||||
my $config = $c->load();
|
||||
|
||||
my $self = {
|
||||
_db => $db,
|
||||
_template => $t,
|
||||
_config => $config,
|
||||
};
|
||||
|
||||
bless $self, $class;
|
||||
@ -22,13 +25,14 @@ sub new {
|
||||
|
||||
sub thread {
|
||||
my ( $self, $subg, $echo ) = @_;
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
my @post = $db->thread( $subg, $echo );
|
||||
|
||||
# Render header
|
||||
my $render = $t->head("ii :: $echo");
|
||||
my $render = $t->head( "ii " . $config->{name} . " :: $echo" );
|
||||
my $count = 0;
|
||||
while ( $count < @post ) {
|
||||
$render .= $t->post( @post[$count] );
|
||||
@ -44,12 +48,15 @@ sub out {
|
||||
my ($self) = @_;
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
my @post = $db->select_out();
|
||||
|
||||
# Render header
|
||||
my $render
|
||||
= $t->head('ii :: неотправленные сообщения');
|
||||
= $t->head( 'ii '
|
||||
. $config->{name}
|
||||
. ' :: неотправленные сообщения' );
|
||||
|
||||
my $count = 0;
|
||||
while ( $count < @post ) {
|
||||
@ -64,17 +71,18 @@ sub out {
|
||||
|
||||
sub echo_mes {
|
||||
my ( $self, $echo, $view ) = @_;
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
my @post = $db->echoes($echo);
|
||||
|
||||
# Render header
|
||||
my $render = $t->head("ii :: $echo");
|
||||
my $render = $t->head( "ii " . $config->{name} . " :: $echo" );
|
||||
$render .= $t->echo($echo);
|
||||
|
||||
my $count = 0;
|
||||
if ($view eq 'thread') {
|
||||
if ( $view eq 'thread' ) {
|
||||
while ( $count < @post ) {
|
||||
|
||||
# Render post
|
||||
@ -85,11 +93,23 @@ sub echo_mes {
|
||||
$count++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
elsif ( $view eq 'all' ) {
|
||||
while ( $count < @post ) {
|
||||
|
||||
# Render post
|
||||
if ( !( @post[$count]->{subg} =~ /Re.+/ ) ) {
|
||||
$render .= $t->post( @post[$count] );
|
||||
}
|
||||
|
||||
$count++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
while ( ( $count < @post ) and ( $count < 50 ) ) {
|
||||
$render .= $t->post( @post[$count] );
|
||||
$count++;
|
||||
}
|
||||
$render .= $t->all($echo);
|
||||
}
|
||||
$render .= $t->foot();
|
||||
|
||||
@ -99,14 +119,16 @@ sub echo_mes {
|
||||
|
||||
sub to_me {
|
||||
my ( $self, $config ) = @_;
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
my @post = $db->to_me($config);
|
||||
my @post_from_me = $db->from_me($config);
|
||||
|
||||
# Render header
|
||||
my $render = $t->head('ii :: Моя переписка');
|
||||
my $render = $t->head(
|
||||
'ii ' . $config->{name} . ' :: Моя переписка' );
|
||||
|
||||
my $count = 0;
|
||||
while ( $count < @post ) {
|
||||
@ -136,7 +158,7 @@ sub index {
|
||||
my @hashes = $db->select_index(50);
|
||||
|
||||
# Render header
|
||||
my $render = $t->head('ii :: Лента');
|
||||
my $render = $t->head( 'ii ' . $config->{name} . ' :: Лента' );
|
||||
$render .= $t->index($echoareas);
|
||||
|
||||
while (<@hashes>) {
|
||||
@ -151,12 +173,40 @@ sub index {
|
||||
return $render;
|
||||
}
|
||||
|
||||
# Messages from user
|
||||
sub user {
|
||||
my ( $self, $user ) = @_;
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
# Render header
|
||||
my $render
|
||||
= $t->head( "ii "
|
||||
. $config->{name}
|
||||
. " :: Сообщения пользователя $user" );
|
||||
|
||||
my @post = $db->select_user($user);
|
||||
|
||||
my $count = 0;
|
||||
while ( $count < @post ) {
|
||||
|
||||
# Render post
|
||||
$render .= $t->post( @post[$count] );
|
||||
$count++;
|
||||
}
|
||||
$render .= $t->foot();
|
||||
|
||||
}
|
||||
|
||||
# Render new message form
|
||||
sub send_new {
|
||||
my ( $self, $echo ) = @_;
|
||||
my $t = $self->{_template};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
my $render = $t->head("ii :: Новое сообщение");
|
||||
my $render = $t->head(
|
||||
"ii " . $config->{name} . " :: Новое сообщение" );
|
||||
|
||||
$render .= $t->new_mes($echo);
|
||||
$render .= $t->foot();
|
||||
@ -167,10 +217,12 @@ sub send_new {
|
||||
# Render send form
|
||||
sub send {
|
||||
my ( $self, $hash ) = @_;
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
my $render = $t->head("ii :: Ответ на $hash");
|
||||
my $render
|
||||
= $t->head( "ii" . $config->{name} . " :: Ответ на $hash" );
|
||||
|
||||
# Render post
|
||||
my $data = $db->select_new($hash);
|
||||
@ -184,10 +236,12 @@ sub send {
|
||||
# Render new messages
|
||||
sub new_mes {
|
||||
my ( $self, $msgs ) = @_;
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $db = $self->{_db};
|
||||
my $t = $self->{_template};
|
||||
my $config = $self->{_config};
|
||||
|
||||
my $render = $t->head('ii :: Новые сообщения');
|
||||
my $render = $t->head(
|
||||
'ii ' . $config->{name} . ' :: Новые сообщения' );
|
||||
|
||||
# Render posts
|
||||
if ( defined($msgs) ) {
|
||||
@ -209,4 +263,26 @@ sub new_mes {
|
||||
return $render;
|
||||
}
|
||||
|
||||
# Search results
|
||||
sub search {
|
||||
my ( $self, @post ) = @_;
|
||||
my $t = $self->{_template};
|
||||
|
||||
# Render header
|
||||
my $render
|
||||
= $t->head(
|
||||
"ii " . $config->{name} . " :: Результаты поиска" );
|
||||
|
||||
my $count = 0;
|
||||
while ( $count < @post ) {
|
||||
|
||||
# Render post
|
||||
$render .= $t->post( @post[$count] );
|
||||
$count++;
|
||||
}
|
||||
$render .= $t->foot();
|
||||
|
||||
return $render;
|
||||
}
|
||||
|
||||
1;
|
||||
|
@ -31,7 +31,7 @@ sub send {
|
||||
my $host = $config->{host};
|
||||
my $auth = $config->{key};
|
||||
$host .= "u/point";
|
||||
my $ua = LWP::UserAgent->new();
|
||||
my $ua = LWP::UserAgent->new(agent => 'Mozilla/5.0 (X11; Linux x86_64; rv:35.0) Gecko/20100101 Firefox/35.0');
|
||||
my $response
|
||||
= $ua->post( $host, { 'pauth' => $auth, 'tmsg' => $base64 } );
|
||||
|
||||
|
76
II/T.pm
76
II/T.pm
@ -1,6 +1,8 @@
|
||||
package II::T;
|
||||
|
||||
use HTML::Template;
|
||||
use HTML::FromText ();
|
||||
use Encode;
|
||||
use Data::Dumper;
|
||||
|
||||
sub new {
|
||||
@ -95,7 +97,7 @@ sub post {
|
||||
my $post = II::T->pre( $data->{post} );
|
||||
|
||||
my $cut;
|
||||
if ( $data->{subg} =~ /Re:\s(.+)/ ) {
|
||||
if ( $data->{subg} =~ /Re:\s+(.+)/ ) {
|
||||
$cut = $1;
|
||||
}
|
||||
else {
|
||||
@ -132,7 +134,7 @@ sub send {
|
||||
|
||||
my $post = II::T->pre( $data->{post} );
|
||||
|
||||
$data->{subg} =~ s/Re:(.+)/$1/g;
|
||||
$data->{subg} =~ s/Re:\s+(.+)/$1/g;
|
||||
|
||||
$p->param( SUBG => $data->{subg} );
|
||||
$p->param( TIME => "$time" );
|
||||
@ -145,18 +147,55 @@ sub send {
|
||||
return $p->output();
|
||||
}
|
||||
|
||||
# Preparsing before input to SQL
|
||||
sub in_pre {
|
||||
my ( $self, $post ) = @_;
|
||||
|
||||
$post =~ s/'/\\'/g;
|
||||
$post =~ s/"/\\"/g;
|
||||
$post =~ s/'/\\'/g;
|
||||
$post =~ s/`/\\`/g;
|
||||
$post =~ s/\$/\\\$/g;
|
||||
|
||||
return $post;
|
||||
}
|
||||
|
||||
# Preparsing output
|
||||
sub pre {
|
||||
my ( $self, $post ) = @_;
|
||||
|
||||
$post =~ s/</</g;
|
||||
$post =~ s/>/>/g;
|
||||
my $t2h = HTML::FromText->new(
|
||||
{ paras => 1,
|
||||
bullets => 1,
|
||||
lines => 1,
|
||||
blockcode => 1,
|
||||
tables => 0,
|
||||
numbers => 0,
|
||||
urls => 0,
|
||||
email => 1,
|
||||
bold => 1,
|
||||
underline => 1,
|
||||
}
|
||||
);
|
||||
|
||||
$post = $t2h->parse( decode_utf8($post) );
|
||||
$post =~ s/>(.+)/<font color='green'>>$1<\/font>/g;
|
||||
$post =~ s/^$/<br>\n/g;
|
||||
$post =~ s/(.?)\n/$1<br>\n/g;
|
||||
$post =~ s/--/—/g;
|
||||
|
||||
# Lists
|
||||
$post =~ s/\*(.+)/<li>$1<\/li>/g;
|
||||
|
||||
# Images
|
||||
$post
|
||||
=~ s/(https?:\/\/.+\.(jpg|png|gif))/<a href="$1"><img src="$1" width="15%" height="15%" \/><\/a>/g;
|
||||
$post
|
||||
=~ s/(https?:\/\/.+\.(JPG|PNG|GIF))/<a href="$1"><img src="$1" width="15%" height="15%" \/><\/a>/g;
|
||||
=~ s/\[img (.+)\]/<a href="$1"><img src="$1" width="15%" height="15%" \/><\/a>/g;
|
||||
|
||||
# ii uri
|
||||
$post =~ s/ii:\/\/(\w+(\.)?\w+\.\d{2,4})/<a href="\/e?echo=$1&view=thread">$1<\/a>/g;
|
||||
$post =~ s/ii:\/\/(\w{20})/<a href="\/send?hash=$1">$1<\/a>/g;
|
||||
|
||||
# Users
|
||||
# $post =~ s/.+? \@(\w+)(.?.+)/<a href="\/u?user=$1">$1<\/a>$2/g;
|
||||
|
||||
# Not are regexp parsing
|
||||
my $pre = 0;
|
||||
my $txt;
|
||||
@ -164,7 +203,7 @@ sub pre {
|
||||
while (<$fh>) {
|
||||
my $line = $_;
|
||||
if ( ( $line =~ /^====/ ) and ( $pre == 0 ) ) {
|
||||
# $txt .= $_;
|
||||
|
||||
$line =~ s/====/<pre class="pre">/g;
|
||||
$pre = 1;
|
||||
}
|
||||
@ -173,11 +212,28 @@ sub pre {
|
||||
$pre = 0;
|
||||
}
|
||||
$txt .= $line;
|
||||
$txt =~ s/<br \/>//g if $pre == 1;
|
||||
$txt =~ s/<li>//g if $pre == 1;
|
||||
$txt =~ s/<\/li>//g if $pre == 1;
|
||||
$txt =~ s/<font.+>(>.+)<\/font>/$1/g if $pre == 1;
|
||||
}
|
||||
close $fh;
|
||||
$txt =~ s/\n/<br>/g;
|
||||
|
||||
return $txt;
|
||||
}
|
||||
|
||||
# All messages footer
|
||||
sub all {
|
||||
my ( $self, $echo ) = @_;
|
||||
|
||||
my $a = HTML::Template->new( filename => 't/all.html' );
|
||||
$a->param( ECHO => $echo );
|
||||
|
||||
return $a->output();
|
||||
}
|
||||
|
||||
# Footer
|
||||
sub foot {
|
||||
my ($self) = @_;
|
||||
|
||||
|
10
README.md
10
README.md
@ -15,15 +15,13 @@ Plack/Perl web client for ii network
|
||||
|
||||
## Install
|
||||
|
||||
Create dirrectories:
|
||||
mkdir {echo,msg}
|
||||
|
||||
Install packages.
|
||||
On Debian based systems:
|
||||
|
||||
apt-get install libplack-perl libhtml-template-perl libsql-abstract-perl \
|
||||
libdbd-sqlite3-perl libconfig-tiny-perl
|
||||
libdbd-sqlite3-perl libconfig-tiny-perl libhtml-fromtext-perl
|
||||
|
||||
## TODO
|
||||
## Run
|
||||
|
||||
* Switch to clean SQL database
|
||||
cd /path/to/iiplc
|
||||
./run.sh
|
||||
|
126
iiplc.app
Normal file → Executable file
126
iiplc.app
Normal file → Executable file
@ -1,13 +1,17 @@
|
||||
# Copyright © 2014 Difrex <difrex.punk@gmail.com>
|
||||
# This work is free. You can redistribute it and/or modify it under the
|
||||
# terms of the Do What The Fuck You Want To Public License, Version 2,
|
||||
# as published by Sam Hocevar. See the COPYING file for more details.
|
||||
#!/usr/bin/perl
|
||||
# Copyright © 2014-2015 Difrex <difrex.punk@gmail.com>
|
||||
# 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 free software. It comes without any warranty, to
|
||||
# the extent permitted by applicable law. You can redistribute it
|
||||
# and/or modify it under the terms of the Do What The Fuck You Want
|
||||
# To Public License, Version 2, as published by Sam Hocevar. See
|
||||
# http://www.wtfpl.net/ for more details.
|
||||
# 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/>.
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
@ -16,6 +20,9 @@ use Plack::Builder;
|
||||
use Plack::Request;
|
||||
use Plack::Response;
|
||||
|
||||
# Static files
|
||||
use Plack::App::File;
|
||||
|
||||
use II::Config;
|
||||
use II::Get;
|
||||
use II::Send;
|
||||
@ -23,13 +30,9 @@ use II::Render;
|
||||
use II::DB;
|
||||
use II::Enc;
|
||||
|
||||
# Debug
|
||||
use Data::Dumper;
|
||||
|
||||
my $c = II::Config->new();
|
||||
my $config = $c->load();
|
||||
|
||||
my $GET = II::Get->new($config);
|
||||
my $render = II::Render->new();
|
||||
|
||||
my $echo = sub {
|
||||
@ -40,7 +43,7 @@ my $echo = sub {
|
||||
my $echo = $req->param('echo');
|
||||
my $view = $req->param('view');
|
||||
|
||||
my $echo_messages = $render->echo_mes($echo, $view);
|
||||
my $echo_messages = $render->echo_mes( $echo, $view );
|
||||
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], ["$echo_messages"], ];
|
||||
};
|
||||
@ -58,23 +61,39 @@ my $thread = sub {
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], ["$thread"], ];
|
||||
};
|
||||
|
||||
# Get new messages
|
||||
my $get = sub {
|
||||
my $msgs = $GET->get_echo();
|
||||
$config = $c->reload();
|
||||
my $msgs;
|
||||
if ( $config->{host} =~ m/.+\,.+/ ) {
|
||||
my @hosts = split( /,/, $config->{host} );
|
||||
foreach my $host (@hosts) {
|
||||
$config->{host} = $host;
|
||||
my $GET = II::Get->new($config);
|
||||
$msgs .= $GET->get_echo();
|
||||
}
|
||||
} else {
|
||||
my $GET = II::Get->new($config);
|
||||
$msgs .= $GET->get_echo();
|
||||
}
|
||||
my $new_mes = $render->new_mes($msgs);
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], ["$new_mes"], ];
|
||||
};
|
||||
|
||||
my $root = sub {
|
||||
$config = $c->reload();
|
||||
my $index = $render->index($config);
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], [$index], ];
|
||||
};
|
||||
|
||||
my $me = sub {
|
||||
$config = $c->reload();
|
||||
my $messages = $render->to_me($config);
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], [$messages], ];
|
||||
};
|
||||
|
||||
my $tree = sub {
|
||||
$config = $c->reload();
|
||||
my $subges = $render->tree($config);
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], ['Дерево'], ];
|
||||
};
|
||||
@ -112,7 +131,7 @@ my $enc = sub {
|
||||
my $hash = $req->param('hash');
|
||||
my $time = time();
|
||||
|
||||
print Dumper($config);
|
||||
$config = $c->reload();
|
||||
my $data = {
|
||||
echo => $echo,
|
||||
to => $to,
|
||||
@ -145,6 +164,11 @@ my $push = sub {
|
||||
my $base64 = $req->param('base64');
|
||||
my $hash = $req->param('hash');
|
||||
|
||||
$config = $c->reload();
|
||||
if ( $config->{host} =~ m/.+\,.+/ ) {
|
||||
my @hosts = split( /,/, $config->{host} );
|
||||
$config->{host} = $hosts[0];
|
||||
}
|
||||
my $s = II::Send->new( $config, $echo, $base64 );
|
||||
$s->send($hash);
|
||||
|
||||
@ -154,16 +178,62 @@ my $push = sub {
|
||||
return [ 302, [ 'Location' => "/e?echo=$echo" ], [], ];
|
||||
};
|
||||
|
||||
builder {
|
||||
mount '/' => $root;
|
||||
mount '/e' => $echo;
|
||||
mount '/s' => $thread;
|
||||
mount '/me' => $me;
|
||||
mount '/tree' => $tree;
|
||||
mount '/get/' => $get;
|
||||
mount '/send' => $send;
|
||||
mount '/enc' => $enc;
|
||||
mount '/out' => $out;
|
||||
mount '/push' => $push;
|
||||
mount '/new' => $new;
|
||||
# Messages from user
|
||||
my $user = sub {
|
||||
my $env = shift;
|
||||
|
||||
my $req = Plack::Request->new($env);
|
||||
my $user = $req->param('user');
|
||||
my $mes_from = $render->user($user);
|
||||
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], [$mes_from], ];
|
||||
};
|
||||
|
||||
# Search
|
||||
########
|
||||
my $search = sub {
|
||||
my $env = shift;
|
||||
|
||||
my $req = Plack::Request->new($env);
|
||||
my $query = $req->param('q');
|
||||
|
||||
my $db = II::DB->new();
|
||||
my @post = $db->do_search($query);
|
||||
|
||||
my $result = $render->search(@post);
|
||||
|
||||
return [ 200, [ 'Content-type' => 'text/html' ], [$result], ];
|
||||
};
|
||||
|
||||
# Delete out message
|
||||
####################
|
||||
my $del = sub {
|
||||
my $env = shift;
|
||||
|
||||
my $req = Plack::Request->new($env);
|
||||
my $hash = $req->param('hash');
|
||||
|
||||
my $db = II::DB->new();
|
||||
$db->del_out($hash);
|
||||
|
||||
return [301, ['Location' => '/out'], [], ];
|
||||
};
|
||||
|
||||
# Mountpoints
|
||||
builder {
|
||||
mount "/static" => Plack::App::File->new( root => './s/' )->to_app;
|
||||
mount "/search" => $search;
|
||||
mount '/' => $root;
|
||||
mount '/e' => $echo;
|
||||
mount '/s' => $thread;
|
||||
mount '/u' => $user;
|
||||
mount '/me' => $me;
|
||||
mount '/tree' => $tree;
|
||||
mount '/get/' => $get;
|
||||
mount '/send' => $send;
|
||||
mount '/enc' => $enc;
|
||||
mount '/out' => $out;
|
||||
mount '/push' => $push;
|
||||
mount '/new' => $new;
|
||||
mount '/del' => $del;
|
||||
};
|
||||
|
3
run.sh
3
run.sh
@ -1,7 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Debug server
|
||||
plackup iiplc.app
|
||||
screen -S ii plackup iiplc.app
|
||||
# plackup iiplc.app
|
||||
|
||||
# Production
|
||||
# starman -l 127.0.0.1:5000 run.pl whatever
|
||||
|
191
s/css/default.css
Normal file
191
s/css/default.css
Normal file
@ -0,0 +1,191 @@
|
||||
.post {
|
||||
box-shadow: 0 0 5px rgba(0, 0, 0, 0.7);
|
||||
border-width: 1;
|
||||
border: solid;
|
||||
border-color: #CCC;
|
||||
border-radius: 10px;
|
||||
margin-top: 0.5em;
|
||||
margin-left: 15%;
|
||||
margin-right: 10%;
|
||||
margin-bottom: 0.7em;
|
||||
padding-left: 5pt;
|
||||
}
|
||||
.post h2 {
|
||||
display: block;
|
||||
background-color: #CCC;
|
||||
border-color: #C9C9C9;
|
||||
border-style: solid;
|
||||
color: #222;
|
||||
border-radius: 5px;
|
||||
padding-left: 0.5em;
|
||||
padding-bottom: 0.15em;
|
||||
margin-right: 10px;
|
||||
margin-top: 0.5em;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.post h2:hover {
|
||||
background-color: #c4c4c4;
|
||||
}
|
||||
.post img {
|
||||
display: inline-block;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.subg {
|
||||
display: block;
|
||||
border-radius: 5px;
|
||||
margin-top: 0.5em;
|
||||
margin-left: 15%;
|
||||
margin-right: 15%;
|
||||
padding-left: 5pt;
|
||||
padding-top: 5pt;
|
||||
}
|
||||
.msg_hash {
|
||||
float: right;
|
||||
margin-right: 1.5em;
|
||||
margin-top: 2em;
|
||||
color: #222;
|
||||
opacity: 0.4;
|
||||
font-family: monospace;
|
||||
font-size: 8pt;
|
||||
}
|
||||
.subg a {
|
||||
color: #222;
|
||||
}
|
||||
.subg a:visited {
|
||||
color: #666;
|
||||
}
|
||||
.mail {
|
||||
display: block;
|
||||
margin-top: 0.1em;
|
||||
margin-left: 0.5em;
|
||||
}
|
||||
.text {
|
||||
display: block;
|
||||
margin-left: 0.5em;
|
||||
margin-top: -0.8em;
|
||||
margin-right: 0.5em;
|
||||
}
|
||||
.post li {
|
||||
margin-left: 1.5em;
|
||||
}
|
||||
.headall {
|
||||
text-align: center;
|
||||
display: block;
|
||||
color: #000;
|
||||
background-color: #C9C9C9;
|
||||
border-radius: 5px;
|
||||
width: 75%;
|
||||
position: top;
|
||||
top: 0px;
|
||||
margin-left: 15%;
|
||||
margin-right: 15%;
|
||||
margin-bottom: 0%;
|
||||
}
|
||||
.headall p {
|
||||
margin-top: -1.5em;
|
||||
text-align: center;
|
||||
padding-bottom: 0.2em;
|
||||
}
|
||||
.headall a {
|
||||
color: #222;
|
||||
}
|
||||
.headall a:hover {
|
||||
color: #666;
|
||||
}
|
||||
.echo {
|
||||
display: block;
|
||||
position: fixed;
|
||||
}
|
||||
.echo a {
|
||||
color: #222;
|
||||
display: inline-block;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-radius: 3px;
|
||||
border-color: #999;
|
||||
box-shadow: 0 0 3px rgba(0, 0, 0, 0.5);
|
||||
padding: 2pt;
|
||||
margin-top: 0.3em;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
opacity: 0.6;
|
||||
}
|
||||
.echo a:hover {
|
||||
color: #222;
|
||||
display: inline-block;
|
||||
box-shadow: 0 0 4px rgba(0, 0, 255, 0.5);
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-radius: 3px;
|
||||
border-color: #999;
|
||||
padding: 2pt;
|
||||
margin-top: 0.3em;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
opacity: 1;
|
||||
}
|
||||
.answer {
|
||||
color: #222;
|
||||
padding: 0.2em;
|
||||
position: relative;
|
||||
}
|
||||
.answer a {
|
||||
color: #222;
|
||||
}
|
||||
.answer a:visited {
|
||||
color: #222;
|
||||
}
|
||||
.view_change {
|
||||
top: 0em;
|
||||
position: relative;
|
||||
margin-left: 15%;
|
||||
margin-right: 15%;
|
||||
}
|
||||
.view_change a {
|
||||
color: #222;
|
||||
}
|
||||
.view_change a:visited {
|
||||
color: #222;
|
||||
}
|
||||
.new_mes {
|
||||
position: relative;
|
||||
}
|
||||
.pre {
|
||||
display: block;
|
||||
border-style: dotted;
|
||||
border-width: 1px;
|
||||
border-color: #666;
|
||||
background-color: #C9C9C9;
|
||||
margin-right: 5%;
|
||||
}
|
||||
.all_link {
|
||||
display: block;
|
||||
border-style: solid;
|
||||
border-width: 1px;
|
||||
border-color: #999;
|
||||
border-radius: 5px;
|
||||
background-color: #C9C9C9;
|
||||
box-shadow: 0 0 5px rgba(0, 0, 0, 0.7);
|
||||
text-align: center;
|
||||
text-decoration: underline;
|
||||
font-size: 12pt;
|
||||
color: #222;
|
||||
width: 8em;
|
||||
padding: 0.2em;
|
||||
margin-left: 45%;
|
||||
margin-right: 55%;
|
||||
}
|
||||
/* Search */
|
||||
.search {
|
||||
position: fixed;
|
||||
top: 2em;
|
||||
left: 0.5em;
|
||||
opacity: 0.4;
|
||||
transition-duration: 0.5s;
|
||||
-webkit-transition-duration: 0.5s;
|
||||
}
|
||||
.search:hover {
|
||||
opacity: 1;
|
||||
transition-duration: 0.5s;
|
||||
-webkit-transition-duration: 0.5s;
|
||||
}
|
3
t/all.html
Normal file
3
t/all.html
Normal file
@ -0,0 +1,3 @@
|
||||
<a class='all_link' href="e?echo=<TMPL_VAR NAME=ECHO>&view=all">
|
||||
Все сообщения
|
||||
</a>
|
135
t/head.html
135
t/head.html
@ -3,135 +3,8 @@
|
||||
<head>
|
||||
<title><TMPL_VAR NAME=TITLE></title>
|
||||
<meta charset='utf8'>
|
||||
<link rel='stylesheet' href='/static/css/default.css'>
|
||||
</head>
|
||||
<STYLE type="text/css">
|
||||
.post {
|
||||
border-width: 1;
|
||||
border: solid;
|
||||
border-color: #C7BA6C;
|
||||
border-radius: 10px;
|
||||
margin-top: 0.5em;
|
||||
margin-left: 15%;
|
||||
margin-right: 10%;
|
||||
padding-left: 5pt;
|
||||
}
|
||||
.post h2 {
|
||||
display: block;
|
||||
/*position: relative;*/
|
||||
background-color: #C7BA6C;
|
||||
border-color: #999;
|
||||
color: #222;
|
||||
border-radius: 5px;
|
||||
padding-left: 0.5em;
|
||||
padding-bottom: 0.15em;
|
||||
margin-right: 10px;
|
||||
margin-top: 0.5em;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.post img {
|
||||
display: inline-block;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.subg {
|
||||
display: block;
|
||||
/*background-color: #C7CCCA;*/
|
||||
border-radius: 5px;
|
||||
margin-top: 0.5em;
|
||||
margin-left: 15%;
|
||||
margin-right: 15%;
|
||||
padding-left: 5pt;
|
||||
padding-top: 5pt;
|
||||
}
|
||||
.subg a {
|
||||
color: #222;
|
||||
}
|
||||
.subg a:visited {
|
||||
color: #666;
|
||||
}
|
||||
.mail {
|
||||
display: block;
|
||||
margin-top: 0.1em;
|
||||
margin-left: 0.5em;
|
||||
}
|
||||
.text {
|
||||
display: block;
|
||||
margin-left: 0.5em;
|
||||
margin-top: -0.8em;
|
||||
}
|
||||
.headall {
|
||||
text-align: center;
|
||||
display: block;
|
||||
color: #000;
|
||||
background-color: #C7BA6C;
|
||||
border-radius: 5px;
|
||||
width: 75%;
|
||||
position: top;
|
||||
top: 0px;
|
||||
margin-left: 15%;
|
||||
margin-right: 15%;
|
||||
margin-bottom: 0%;
|
||||
}
|
||||
.headall p {
|
||||
margin-top: -1.5em;
|
||||
text-align: center;
|
||||
padding-bottom: 0.2em;
|
||||
}
|
||||
.headall a {
|
||||
color: #222;
|
||||
}
|
||||
.headall a:hover {
|
||||
color: #666;
|
||||
}
|
||||
.echo {
|
||||
display: block;
|
||||
background-color: #C7BA6C;
|
||||
/*top: 0px;*/
|
||||
border-width: 1;
|
||||
border: solid;
|
||||
border-color: #C7BA6C;
|
||||
border-radius: 5px;
|
||||
/*margin-top: 1em;*/
|
||||
padding: 0.2em;
|
||||
position: fixed;
|
||||
}
|
||||
.echo a {
|
||||
color: #222;
|
||||
}
|
||||
.answer {
|
||||
color: #222;
|
||||
padding: 0.2em;
|
||||
position: relative;
|
||||
}
|
||||
.answer a {
|
||||
color: #222;
|
||||
}
|
||||
.answer a:visited {
|
||||
color: #222;
|
||||
}
|
||||
.view_change {
|
||||
top: 0em;
|
||||
position: relative;
|
||||
margin-left: 15%;
|
||||
margin-right: 15%;
|
||||
}
|
||||
.view_change a {
|
||||
color: #222;
|
||||
}
|
||||
.view_change a:visited {
|
||||
color: #222;
|
||||
}
|
||||
.new_mes {
|
||||
position: relative;
|
||||
}
|
||||
.pre {
|
||||
display: block;
|
||||
border-style: dotted;
|
||||
border-width: 1px;
|
||||
border-color: #666;
|
||||
background-color: #C9C9C9;
|
||||
margin-right: 5%;
|
||||
}
|
||||
</STYLE>
|
||||
<body>
|
||||
<div class='headall'>
|
||||
<h1><TMPL_VAR NAME=TITLE></h1>
|
||||
@ -142,4 +15,10 @@
|
||||
<b>[</b> <a href="/out">неотправленные сообщения</a> <b>]</b> 
|
||||
</p>
|
||||
</div>
|
||||
<div class='search'>
|
||||
<form action='/search' method='POST'>
|
||||
<input type='text' name='q'><br>
|
||||
<input type='submit' value='Искать'>
|
||||
</form>
|
||||
</div>
|
||||
<!-- <hr> -->
|
||||
|
@ -12,5 +12,6 @@
|
||||
</div>
|
||||
<div class=answer>
|
||||
<a href="/push?echo=<TMPL_VAR NAME=ECHO>&base64=<TMPL_VAR NAME=BASE64>&hash=<TMPL_VAR NAME=HASH>">Отправить</a>
|
||||
<a href="/del?hash=<TMPL_VAR NAME=HASH>">Удалить</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,9 +1,12 @@
|
||||
<div class=post>
|
||||
<div class='msg_hash'>
|
||||
MsgID: <TMPL_VAR NAME=HASH>
|
||||
</div>
|
||||
<a style="text-decoration:none;" href="/s?subg=<TMPL_VAR NAME=CUT>&echo=<TMPL_VAR NAME=ECHO>"><h2><TMPL_VAR NAME=SUBG></h2></a>
|
||||
<div class=mail>
|
||||
<i><TMPL_VAR NAME=TIME></i><br>
|
||||
From: <strong><TMPL_VAR NAME=FROM></strong><br>
|
||||
To: <strong><TMPL_VAR NAME=TO></strong> in <TMPL_VAR NAME=ECHO>
|
||||
From: <strong><a style='color:#222;text-decoration:none;' href='/u?user=<TMPL_VAR NAME=FROM>'><TMPL_VAR NAME=FROM></a></strong><br>
|
||||
To: <strong><a style='color:#222;text-decoration:none;' href='/u?user=<TMPL_VAR NAME=TO>'><TMPL_VAR NAME=TO></a></strong> in <a style='color:#222;' href='/e?echo=<TMPL_VAR NAME=ECHO>&view=thread'><TMPL_VAR NAME=ECHO></a>
|
||||
</div>
|
||||
<div class=text>
|
||||
<p>
|
||||
@ -13,4 +16,4 @@
|
||||
<div class=answer>
|
||||
<a href="/send?hash=<TMPL_VAR NAME=HASH>">Ответить на сообщение</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user