ulogger beta version
This commit is contained in:
parent
70eecac6be
commit
bff36847be
16
Changelog
16
Changelog
@ -1,17 +1,3 @@
|
||||
Changelog
|
||||
|
||||
2.3 admin user with access to all tracks (markcs)
|
||||
Backitude support (markcs)
|
||||
minor fixes
|
||||
|
||||
2.2 preferences stored in cookies
|
||||
display comments in popups
|
||||
option to hide menu
|
||||
|
||||
2.1 new OpenLayers layers
|
||||
German translation (dtrieb)
|
||||
minor fixes
|
||||
|
||||
2.0 OpenLayers support added
|
||||
|
||||
1.0 initial version
|
||||
0.1 initial version
|
||||
|
833
LICENSE
833
LICENSE
@ -1,281 +1,622 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
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 licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
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
|
||||
this service 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.
|
||||
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 make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
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 give the recipients all the rights that
|
||||
you have. 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.
|
||||
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.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
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.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
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.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
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.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
0. Definitions.
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
"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.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
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) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
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.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
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.
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
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.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
1. Source Code.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
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.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
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.
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
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.
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
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.
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
2. Basic Permissions.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
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.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
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.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
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.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
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
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
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.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
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.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
14. Revised Versions of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
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 a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
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.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
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.
|
||||
|
||||
NO WARRANTY
|
||||
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.
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE 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.
|
||||
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
|
||||
|
||||
@ -287,15 +628,15 @@ 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
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
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
|
||||
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
|
||||
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,
|
||||
@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
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.
|
||||
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 is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
<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, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
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 your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
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/>.
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This 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.
|
||||
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>.
|
17
README
17
README
@ -1,15 +1,11 @@
|
||||
This is a simple web viewer for GPS tracks uploaded with mobile client.
|
||||
It is designed to work with Android version of great app TrackMe (http://www.luisespinosa.com/trackme_eng.html),
|
||||
but it should be easy to adjust it for other clients (other database tables).
|
||||
Interface "look and feel" is based on TrackMe Display (http://forum.xda-developers.com/showthread.php?t=477394).
|
||||
It is possible to switch between Google Maps API and OpenLayers API with OpenStreetMap (or any other compatible base layer).
|
||||
It also supports Backitude client (thanks to markcs: see README_Backitude).
|
||||
This is a web application for real-time collection of geolocation data, tracks viewing and management.
|
||||
Together with a dedicated μlogger mobile client it may be used as a complete self hosted server–client solution for logging and monitoring users' geolocation.
|
||||
|
||||
Live demo:
|
||||
- http://flaa.fabiszewski.net/phptrackme/
|
||||
- http://flaa.fabiszewski.net/ulogger/
|
||||
|
||||
Requirements:
|
||||
- PHP 5.1.2
|
||||
- PHP 5.5
|
||||
- MYSQL 4.1
|
||||
- browser with javascript enabled, cookies for authentication and saving preferences
|
||||
|
||||
@ -21,15 +17,14 @@ Features:
|
||||
- multiple users
|
||||
- user authentication
|
||||
- Google Maps API v3
|
||||
- OpenLayers v2
|
||||
- OpenLayers v2 (OpenStreet and other layers)
|
||||
- ajax
|
||||
- server based configuration
|
||||
- user preferences stored in cookies
|
||||
|
||||
Todo
|
||||
- install script
|
||||
- custom icons
|
||||
- write opensource client?
|
||||
|
||||
License
|
||||
- GPL
|
||||
- μlogger is a fork of phpTrackme - tracks viewer I wrote for TrackMe app
|
@ -1,42 +0,0 @@
|
||||
Backitude is an Android client that is designed to capture the location
|
||||
of your device at configurable time intervals or whenever a position is served
|
||||
up by the operating system. You can grab it from https://play.google.com/store/apps/details?id=gaugler.backitude
|
||||
|
||||
To configure Backitude to work with the custom server, you need to
|
||||
set the following parameters in the custom server settings:
|
||||
|
||||
Server URL: http://<your server>/requests.php
|
||||
Request Type: POST
|
||||
Successful Response Codes: 200,201
|
||||
Authentication options: Credentials in POST parameters
|
||||
User Name: What ever you choose
|
||||
Password: What ever you choose
|
||||
Custom Field 1: upload
|
||||
Custom Field 2: backitude
|
||||
|
||||
User Name: u
|
||||
Password: p
|
||||
Latitude: lat
|
||||
Longitude: long
|
||||
Accuracy: accuracy
|
||||
Speed: speed
|
||||
Altitude: alt
|
||||
Direction Bearing: angle
|
||||
Location Timestamp: <this can be deleted>
|
||||
Request Timestamp: do
|
||||
Timezone Offset: <this can be deleted>
|
||||
Custom Field 1: a
|
||||
Custom Field 2: db
|
||||
|
||||
mysql needs to be configured by running the trackme.sql sql script file.
|
||||
|
||||
config.php needs to be configured.
|
||||
|
||||
Within config.php:
|
||||
|
||||
- Use trackme as the database name.
|
||||
- Initially set allow_registration = 1 so Backitude can register and your user/pass is automatically created
|
||||
|
||||
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -133,7 +133,9 @@ function setMarker(p,i,posLen) {
|
||||
((p.comments != null)?'<div id="pcomments">'+p.comments+'</div>':'')+
|
||||
'<div id="pleft"><b>'+lang_time+':</b> '+p.dateoccured+'<br />'+
|
||||
((p.speed != null)?'<b>'+lang_speed+':</b> '+(p.speed.toKmH()*factor_kmh)+' '+unit_kmh+'<br />':'')+
|
||||
((p.altitude != null)?'<b>'+lang_altitude+':</b> '+(p.altitude*factor_m).toFixed()+' '+unit_m+'<br />':'')+'</div>'+
|
||||
((p.altitude != null)?'<b>'+lang_altitude+':</b> '+(p.altitude*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
((p.accuracy != null)?'<b>'+lang_accuracy+':</b> '+(p.accuracy*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
'</div>'+
|
||||
((latest==0)?
|
||||
('<div id="pright"><b>'+lang_ttime+':</b> '+p.totalSeconds.toHMS()+'<br />'+
|
||||
'<b>'+lang_aspeed+':</b> '+((p.totalSeconds>0)?((p.totalMeters/p.totalSeconds).toKmH()*factor_kmh).toFixed():0)+' '+unit_kmh+'<br />'+
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -168,7 +168,9 @@ function setMarker(p,i,posLen) {
|
||||
((p.comments != null)?'<div id="pcomments">'+p.comments+'</div>':'')+
|
||||
'<div id="pleft"><b>'+lang_time+':</b> '+p.dateoccured+'<br />'+
|
||||
((p.speed != null)?'<b>'+lang_speed+':</b> '+(p.speed.toKmH()*factor_kmh)+' '+unit_kmh+'<br />':'')+
|
||||
((p.altitude != null)?'<b>'+lang_altitude+':</b> '+(p.altitude*factor_m).toFixed()+' '+unit_m+'<br />':'')+'</div>'+
|
||||
((p.altitude != null)?'<b>'+lang_altitude+':</b> '+(p.altitude*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
((p.accuracy != null)?'<b>'+lang_accuracy+':</b> '+(p.accuracy*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
'</div>'+
|
||||
((latest==0)?
|
||||
('<div id="pright"><b>'+lang_ttime+':</b> '+p.totalSeconds.toHMS()+'<br />'+
|
||||
'<b>'+lang_aspeed+':</b> '+((p.totalSeconds>0)?((p.totalMeters/p.totalSeconds).toKmH()*factor_kmh).toFixed():0)+' '+unit_kmh+'<br />'+
|
||||
|
123
auth.php
123
auth.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -19,72 +19,80 @@
|
||||
*/
|
||||
require_once("config.php");
|
||||
// if is set cookie overwrite config value
|
||||
if (isset($_COOKIE["phpTrackme_api"])) { $mapapi = $_COOKIE["phpTrackme_api"]; }
|
||||
if (isset($_COOKIE["phpTrackme_lang"])) { $lang = $_COOKIE["phpTrackme_lang"]; }
|
||||
if (isset($_COOKIE["phpTrackme_units"])) { $units = $_COOKIE["phpTrackme_units"]; }
|
||||
if (isset($_COOKIE["phpTrackme_interval"])) { $interval = $_COOKIE["phpTrackme_interval"]; }
|
||||
if (isset($_COOKIE["ulogger_api"])) { $mapapi = $_COOKIE["ulogger_api"]; }
|
||||
if (isset($_COOKIE["ulogger_lang"])) { $lang = $_COOKIE["ulogger_lang"]; }
|
||||
if (isset($_COOKIE["ulogger_units"])) { $units = $_COOKIE["ulogger_units"]; }
|
||||
if (isset($_COOKIE["ulogger_interval"])) { $interval = $_COOKIE["ulogger_interval"]; }
|
||||
require_once("lang.php");
|
||||
$mysqli = new mysqli($dbhost, $dbuser, $dbpass, $dbname);
|
||||
if ($mysqli->connect_errno) {
|
||||
printf("Connect failed: %s\n", $mysqli->connect_error);
|
||||
if (defined('headless')) {
|
||||
header('HTTP/1.1 503 Service Unavailable', true, 503);
|
||||
} else {
|
||||
printf("Connect failed: %s\n", $mysqli->connect_error);
|
||||
}
|
||||
exit();
|
||||
}
|
||||
$mysqli->set_charset("utf8");
|
||||
$auth = NULL;
|
||||
$admin = NULL;
|
||||
if ($require_authentication) {
|
||||
if ($require_authentication || defined('headless')) {
|
||||
/* authentication */
|
||||
session_name('trackme');
|
||||
session_name('ulogger');
|
||||
session_start();
|
||||
$sid = session_id();
|
||||
|
||||
$auth = (isset($_SESSION['auth']) ? $_SESSION['auth'] : "");
|
||||
$admin = (isset($_SESSION['admin']) ? $_SESSION['admin'] : "");
|
||||
$user = (isset($_REQUEST['user']) ? $_REQUEST['user'] : "");
|
||||
$pass = (isset($_REQUEST['pass']) ? md5($salt.$_REQUEST['pass']) : "");
|
||||
$pass = (isset($_REQUEST['pass']) ? $_REQUEST['pass'] : "");
|
||||
$ssl = ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == "" || $_SERVER['HTTPS'] == "off") ? "http" : "https");
|
||||
$auth_error = (isset($_REQUEST['auth_error']) ? $_REQUEST['auth_error'] : 0);
|
||||
|
||||
// not authenticated and username not submited
|
||||
// load form
|
||||
if ((!$auth) && (!$user)){
|
||||
print
|
||||
'<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>'.$lang_title.'</title>
|
||||
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
|
||||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
||||
<link rel="stylesheet" type="text/css" href="main.css">
|
||||
<script type="text/javascript">
|
||||
function focus() {
|
||||
document.forms[0].elements[0].focus();
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body onload="focus()">
|
||||
<div id="login">
|
||||
<div id="title">'.$lang_title.'</div>
|
||||
<div id="subtitle">'.$lang_private.'</div>
|
||||
<form action="index.php" method="post">
|
||||
'.$lang_username.':<br />
|
||||
<input type="text" name="user"><br />
|
||||
'.$lang_password.':<br />
|
||||
<input type="password" name="pass"><br />
|
||||
<br />
|
||||
<input type="submit" value="'.$lang_login.'">
|
||||
</form>
|
||||
<div id="error">'.(($auth_error==1) ? $lang_authfail : "").'</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>';
|
||||
if (defined('headless')) {
|
||||
header('HTTP/1.1 401 Unauthorized', true, 401);
|
||||
} else {
|
||||
print
|
||||
'<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>'.$lang_title.'</title>
|
||||
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
|
||||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
||||
<link rel="stylesheet" type="text/css" href="main.css">
|
||||
<script type="text/javascript">
|
||||
function focus() {
|
||||
document.forms[0].elements[0].focus();
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body onload="focus()">
|
||||
<div id="login">
|
||||
<div id="title">'.$lang_title.'</div>
|
||||
<div id="subtitle">'.$lang_private.'</div>
|
||||
<form action="index.php" method="post">
|
||||
'.$lang_username.':<br />
|
||||
<input type="text" name="user"><br />
|
||||
'.$lang_password.':<br />
|
||||
<input type="password" name="pass"><br />
|
||||
<br />
|
||||
<input type="submit" value="'.$lang_login.'">
|
||||
</form>
|
||||
<div id="error">'.(($auth_error==1) ? $lang_authfail : "").'</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>';
|
||||
}
|
||||
$mysqli->close();
|
||||
exit;
|
||||
exit();
|
||||
}
|
||||
|
||||
// username submited
|
||||
if ((!$auth) && ($user)){
|
||||
$query = $mysqli->prepare("SELECT ID,username,password FROM users WHERE username=? LIMIT 1");
|
||||
$query = $mysqli->prepare("SELECT id, login, password FROM users WHERE login=? LIMIT 1");
|
||||
$query->bind_param('s', $user);
|
||||
$query->execute();
|
||||
$query->bind_result($rec_ID, $rec_user, $rec_pass);
|
||||
@ -92,34 +100,43 @@ if ($require_authentication) {
|
||||
$query->free_result();
|
||||
//correct pass
|
||||
|
||||
if (($user==$rec_user) && ($pass==$rec_pass)) {
|
||||
if (($user == $rec_user) && password_verify($pass, $rec_pass)) {
|
||||
// login successful
|
||||
//delete old session
|
||||
$_SESSION = NULL;
|
||||
session_destroy();
|
||||
// start new session
|
||||
session_name('trackme');
|
||||
session_name('ulogger');
|
||||
session_start();
|
||||
if (($user==$admin_user) && ($admin_user != "")) {
|
||||
if (($user == $admin_user) && !empty($admin_user)) {
|
||||
$_SESSION['admin'] = $admin_user;
|
||||
}
|
||||
$_SESSION['auth'] = $rec_ID;
|
||||
$url = str_replace("//", "/", $_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/index.php");
|
||||
header("Location: $ssl://$url");
|
||||
exit;
|
||||
if (defined('headless')) {
|
||||
$url = str_replace("//", "/", $_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/client/index.php");
|
||||
header("Location: $ssl://$url");
|
||||
} else {
|
||||
$url = str_replace("//", "/", $_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/index.php");
|
||||
header("Location: $ssl://$url");
|
||||
}
|
||||
exit();
|
||||
} else {
|
||||
// unsuccessful
|
||||
$error = "?auth_error=1";
|
||||
// destroy session
|
||||
$_SESSION = NULL;
|
||||
if (isset($_COOKIE[session_name('trackme')])) {
|
||||
setcookie(session_name('trackme'),'',time()-42000,'/');
|
||||
if (isset($_COOKIE[session_name('ulogger')])) {
|
||||
setcookie(session_name('ulogger'),'',time()-42000,'/');
|
||||
}
|
||||
session_destroy();
|
||||
$mysqli->close();
|
||||
$url = str_replace("//", "/", $_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/index.php");
|
||||
header("Location: $ssl://$url$error");
|
||||
exit;
|
||||
if (defined('headless')) {
|
||||
header('HTTP/1.1 401 Unauthorized', true, 401);
|
||||
} else {
|
||||
$url = str_replace("//", "/", $_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/index.php");
|
||||
header("Location: $ssl://$url$error");
|
||||
}
|
||||
exit();
|
||||
}
|
||||
}
|
||||
/* end of authentication */
|
||||
|
130
client/index.php
Normal file
130
client/index.php
Normal file
@ -0,0 +1,130 @@
|
||||
<?php
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library 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 Library General Public
|
||||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
function setError(&$response, $message) {
|
||||
$response['error'] = true;
|
||||
$response['message'] = $message;
|
||||
}
|
||||
|
||||
define("headless", true);
|
||||
require_once("../auth.php");
|
||||
|
||||
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
|
||||
$userid = $_SESSION['auth'];
|
||||
|
||||
$response = [ 'error' => false ];
|
||||
|
||||
$mysqli = new mysqli($dbhost, $dbuser, $dbpass, $dbname);
|
||||
if ($mysqli->connect_errno) {
|
||||
setError($response, $mysqli->error);
|
||||
$action = null;
|
||||
}
|
||||
|
||||
switch ($action) {
|
||||
// action: authorize
|
||||
case "auth":
|
||||
break;
|
||||
|
||||
// action: adduser
|
||||
case "adduser":
|
||||
$login = isset($_REQUEST['login']) ? $_REQUEST['login'] : NULL;
|
||||
$hash = isset($_REQUEST['password']) ? password_hash($_REQUEST['password'], PASSWORD_DEFAULT) : NULL;
|
||||
if (!empty($login) && !empty($hash)) {
|
||||
$sql = "INSERT INTO users (login, password) VALUES (?, ?)";
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('ss', $login, $hash);
|
||||
$query->execute();
|
||||
$userid = $mysqli->insert_id;
|
||||
$query->close();
|
||||
if ($mysqli->errno) {
|
||||
setError($response, $mysqli->error);
|
||||
break;
|
||||
}
|
||||
// return user id
|
||||
$response['userid'] = $userid;
|
||||
} else {
|
||||
setError($response, "Empty login");
|
||||
}
|
||||
break;
|
||||
|
||||
// action: addtrack
|
||||
case "addtrack":
|
||||
$trackname = isset($_REQUEST['track']) ? $_REQUEST['track'] : NULL;
|
||||
if (empty($trackname)) {
|
||||
setError($response, "missing required parameter");
|
||||
break;
|
||||
}
|
||||
$sql = "INSERT INTO tracks (user_id, name) VALUES (?, ?)";
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('is', $userid, $trackname);
|
||||
$query->execute();
|
||||
$trackid = $mysqli->insert_id;
|
||||
$query->close();
|
||||
if ($mysqli->errno) {
|
||||
setError($response, $mysqli->error);
|
||||
break;
|
||||
}
|
||||
// return track id
|
||||
$response['trackid'] = $trackid;
|
||||
break;
|
||||
|
||||
// action: addposition
|
||||
case "addpos":
|
||||
$lat = isset($_REQUEST["lat"]) ? $_REQUEST["lat"] : NULL;
|
||||
$lon = isset($_REQUEST["lon"]) ? $_REQUEST["lon"] : NULL;
|
||||
$time = isset($_REQUEST["time"]) ? $_REQUEST["time"] : NULL;
|
||||
$altitude = isset($_REQUEST["altitude"]) ? $_REQUEST["altitude"] : NULL;
|
||||
$speed = isset($_REQUEST["speed"]) ? $_REQUEST["speed"] : NULL;
|
||||
$bearing = isset($_REQUEST["bearing"]) ? $_REQUEST["bearing"] : NULL;
|
||||
$accuracy = isset($_REQUEST["accuracy"]) ? $_REQUEST["accuracy"] : NULL;
|
||||
$provider = isset($_REQUEST["provider"]) ? $_REQUEST["provider"] : NULL;
|
||||
$comment = isset($_REQUEST["comment"]) ? $_REQUEST["comment"] : NULL;
|
||||
$imageid = isset($_REQUEST["imageid"]) ? $_REQUEST["imageid"] : NULL;
|
||||
$trackid = isset($_REQUEST["trackid"]) ? $_REQUEST["trackid"] : NULL;
|
||||
|
||||
if (is_null($lat) || is_null($lon) || is_null($time) || is_null($trackid)) {
|
||||
setError($response, "missing required parameter");
|
||||
break;
|
||||
}
|
||||
|
||||
$sql = "INSERT INTO positions "
|
||||
."(user_id, track_id,"
|
||||
."time, latitude, longitude, altitude, speed, bearing, accuracy, provider, comment, image_id)"
|
||||
."VALUES (?,?,FROM_UNIXTIME(?),?,?,?,?,?,?,?,?,?)";
|
||||
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('iisddddddssi',
|
||||
$userid, $trackid,
|
||||
$time, $lat, $lon, $altitude, $speed, $bearing, $accuracy, $provider, $comment, $imageid);
|
||||
$query->execute();
|
||||
$query->close();
|
||||
if ($mysqli->errno) {
|
||||
setError($response, $mysqli->error);
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
$mysqli->close();
|
||||
|
||||
header('Content-Type: application/json');
|
||||
echo json_encode($response);
|
||||
exit();
|
||||
?>
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -17,7 +17,11 @@
|
||||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
$version = "2.3";
|
||||
|
||||
// This is default configuration file.
|
||||
// Copy it to config.php and customize
|
||||
|
||||
$version = "0.1";
|
||||
|
||||
// default map drawing framework
|
||||
// (gmaps = google maps, openlayers = openlayers/osm)
|
||||
@ -47,7 +51,6 @@ $dbhost = ""; // mysql host, eg. localhost
|
||||
$dbuser = ""; // database user
|
||||
$dbpass = ""; // database pass
|
||||
$dbname = ""; // database name
|
||||
$salt = ""; // fill in random string here, it will increase security of password hashes
|
||||
|
||||
// other
|
||||
// require login/password authentication
|
||||
@ -66,14 +69,15 @@ $allow_registration = 0;
|
||||
$interval = 10;
|
||||
|
||||
// Default language
|
||||
// (en, pl, de)
|
||||
// (en, pl, de, hu)
|
||||
$lang = "en";
|
||||
//$lang = "pl";
|
||||
//$lang = "de";
|
||||
//$lang = "hu";
|
||||
|
||||
// units
|
||||
// (metric, imperial)
|
||||
$units = "metric";
|
||||
//$units = "imperial";
|
||||
|
||||
?>
|
||||
?>
|
19
download.php
19
download.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -46,8 +46,8 @@ function haversine_distance($lat1, $lon1, $lat2, $lon2) {
|
||||
$lon2 = deg2rad($lon2);
|
||||
$latD = $lat2 - $lat1;
|
||||
$lonD = $lon2 - $lon1;
|
||||
$angle = 2*asin(sqrt(pow(sin($latD/2),2)+cos($lat1)*cos($lat2)*pow(sin($lonD/2),2)));
|
||||
return $angle * 6371000;
|
||||
$bearing = 2*asin(sqrt(pow(sin($latD/2),2)+cos($lat1)*cos($lat2)*pow(sin($lonD/2),2)));
|
||||
return $bearing * 6371000;
|
||||
}
|
||||
function addStyle($xml,$name,$url) {
|
||||
$xml->startElement("Style");
|
||||
@ -69,11 +69,16 @@ function toHMS($s) {
|
||||
}
|
||||
|
||||
if ($trackid>0 && $userid>0) {
|
||||
$query = $mysqli->prepare("SELECT positions.ID,Latitude,Longitude,Altitude,Speed,Angle,DateOccurred,username,Name FROM positions LEFT JOIN users ON (positions.FK_Users_ID=users.ID) LEFT JOIN trips ON (positions.FK_Trips_ID=trips.ID) WHERE positions.FK_Users_ID=? AND positions.FK_Trips_ID=? ORDER BY positions.DateOccurred");
|
||||
$query = $mysqli->prepare("SELECT p.id, p.latitude, p.longitude, p.altitude, p.speed, p.bearing, p.time, u.login, t.name
|
||||
FROM positions p
|
||||
LEFT JOIN users u ON (p.user_id=u.id)
|
||||
LEFT JOIN tracks t ON (p.track_id=t.id)
|
||||
WHERE p.user_id=? AND p.track_id=?
|
||||
ORDER BY p.time");
|
||||
$query->bind_param("ii", $userid, $trackid);
|
||||
$query->execute();
|
||||
$query->store_result();
|
||||
$query->bind_result($positionid,$latitude,$longitude,$altitude,$speed,$angle,$dateoccured,$username,$trackname);
|
||||
$query->bind_result($positionid,$latitude,$longitude,$altitude,$speed,$bearing,$dateoccured,$username,$trackname);
|
||||
$query->fetch(); // take just one row to get trackname etc
|
||||
$query->data_seek(0); // and reset result set
|
||||
switch ($type) {
|
||||
@ -166,7 +171,7 @@ if ($trackid>0 && $userid>0) {
|
||||
$xml->startElement("gpx");
|
||||
$xml->writeAttribute("xmlns", "http://www.topografix.com/GPX/1/1");
|
||||
$xml->writeAttribute("xmlns:gpxdata", "http://www.cluetrust.com/XML/GPXDATA/1/0");
|
||||
$xml->writeAttribute("creator", "phpTrackme");
|
||||
$xml->writeAttribute("creator", "μlogger");
|
||||
$xml->writeAttribute("version", "1.1");
|
||||
$xml->startElement("metadata");
|
||||
$xml->writeElement("name", $trackname);
|
||||
|
26
export.php
26
export.php
@ -1,26 +0,0 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library 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 Library General Public
|
||||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
// FIXME
|
||||
// Do we really need this?
|
||||
// It is easier to export from web interface.
|
||||
// If needed it may be easily adjusted from download.php
|
||||
echo "<Result>0</Result>";
|
||||
exit();
|
||||
?>
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -36,16 +36,25 @@ function haversine_distance($lat1, $lon1, $lat2, $lon2) {
|
||||
if ($userid) {
|
||||
if ($trackid) {
|
||||
// get all track data
|
||||
$query = $mysqli->prepare("SELECT positions.ID,positions.Latitude,positions.Longitude,positions.Altitude,positions.Speed,positions.Angle,positions.DateOccurred,positions.Comments,users.username,trips.Name,trips.ID FROM positions LEFT JOIN users ON (positions.FK_Users_ID=users.ID) LEFT JOIN trips ON (positions.FK_Trips_ID=trips.ID) WHERE positions.FK_Users_ID=? AND positions.FK_Trips_ID=? ORDER BY positions.DateOccurred");
|
||||
$query = $mysqli->prepare("SELECT p.id, p.latitude, p.longitude, p.altitude, p.speed, p.bearing, p.time, p.accuracy, p.comment, u.login, t.name, t.id
|
||||
FROM positions p
|
||||
LEFT JOIN users u ON (p.user_id=u.id)
|
||||
LEFT JOIN tracks t ON (p.track_id=t.id)
|
||||
WHERE p.user_id=? AND p.track_id=?
|
||||
ORDER BY p.time");
|
||||
$query->bind_param('ii', $userid, $trackid);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// get data only for latest point
|
||||
$query = $mysqli->prepare("SELECT positions.ID,positions.Latitude,positions.Longitude,positions.Altitude,positions.Speed,positions.Angle,positions.DateOccurred,positions.Comments,users.username,trips.Name,trips.ID FROM positions LEFT JOIN users ON (positions.FK_Users_ID=users.ID) LEFT JOIN trips ON (positions.FK_Trips_ID=trips.ID) WHERE positions.FK_Users_ID=? ORDER BY positions.DateOccurred DESC LIMIT 1");
|
||||
$query = $mysqli->prepare("SELECT p.id, p.latitude, p.longitude, p.altitude, p.speed, p.bearing, p.time, p.accuracy, p.comment, u.login, t.name, t.id
|
||||
FROM positions p
|
||||
LEFT JOIN users u ON (p.user_id=u.id)
|
||||
LEFT JOIN tracks t ON (p.track_id=t.id)
|
||||
WHERE p.user_id=?
|
||||
ORDER BY p.time DESC LIMIT 1");
|
||||
$query->bind_param('i', $userid);
|
||||
}
|
||||
$query->execute();
|
||||
$query->bind_result($positionid,$latitude,$longitude,$altitude,$speed,$angle,$dateoccured,$comments,$username,$trackname,$trackid);
|
||||
$query->bind_result($positionid,$latitude,$longitude,$altitude,$speed,$angle,$dateoccured,$accuracy,$comments,$username,$trackname,$trackid);
|
||||
|
||||
header("Content-type: text/xml");
|
||||
$xml = new XMLWriter();
|
||||
@ -63,6 +72,7 @@ if ($userid) {
|
||||
$xml->writeElement("speed", $speed);
|
||||
$xml->writeElement("angle", $angle);
|
||||
$xml->writeElement("dateoccured", $dateoccured);
|
||||
$xml->writeElement("accuracy", $accuracy);
|
||||
$xml->writeElement("comments", $comments);
|
||||
$xml->writeElement("username", $username);
|
||||
$xml->writeElement("trackid", $trackid);
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -22,10 +22,10 @@ require_once("auth.php");
|
||||
$userid = ((isset($_REQUEST["userid"]) && is_numeric($_REQUEST["userid"])) ? $_REQUEST["userid"] : 0);
|
||||
|
||||
if ($userid) {
|
||||
$query = $mysqli->prepare("SELECT ID,Name FROM trips WHERE FK_Users_ID=? ORDER BY ID DESC");
|
||||
$query = $mysqli->prepare("SELECT id, name FROM tracks WHERE user_id=? ORDER BY id DESC");
|
||||
$query->bind_param('i', $userid);
|
||||
$query->execute();
|
||||
$query->bind_result($trackid,$trackname);
|
||||
$query->bind_result($trackid, $trackname);
|
||||
|
||||
header("Content-type: text/xml");
|
||||
$xml = new XMLWriter();
|
27
index.php
27
index.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -17,15 +17,14 @@
|
||||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
require_once("config.php");
|
||||
require_once("auth.php");
|
||||
|
||||
if ($auth && !$admin) {
|
||||
// get username
|
||||
$query = "SELECT username FROM users WHERE ID='$auth' LIMIT 1";
|
||||
$query = "SELECT login FROM users WHERE id='$auth' LIMIT 1";
|
||||
$result = $mysqli->query($query);
|
||||
$row = $result->fetch_assoc();
|
||||
$user = $row["username"];
|
||||
$user = $row["login"];
|
||||
|
||||
// users
|
||||
$user_form = '<u>'.$lang_user.'</u><br />'.$user.' (<a href="logout.php">'.$lang_logout.'</a>)';
|
||||
@ -47,7 +46,7 @@ else {
|
||||
<select name="user" onchange="selectUser(this)">
|
||||
<option value="0">'.$lang_suser.'</option>';
|
||||
// get last position user
|
||||
$query = "SELECT FK_Users_ID FROM positions ORDER BY DateOccurred LIMIT 1";
|
||||
$query = "SELECT p.user_id FROM positions p ORDER BY p.time LIMIT 1";
|
||||
$result = $mysqli->query($query);
|
||||
if ($result->num_rows) {
|
||||
$last = $result->fetch_row();
|
||||
@ -55,10 +54,10 @@ else {
|
||||
} else {
|
||||
$last_id = "";
|
||||
}
|
||||
$query = "SELECT ID,username FROM users ORDER BY username";
|
||||
$query = "SELECT id, login FROM users ORDER BY login";
|
||||
$result = $mysqli->query($query);
|
||||
while ($row = $result->fetch_assoc()) {
|
||||
$user_form .= sprintf("<option %svalue=\"%s\">%s</option>\n", ($row["ID"] == $last_id)?"selected ":"",$row["ID"], $row["username"]);
|
||||
$user_form .= sprintf("<option %svalue=\"%s\">%s</option>\n", ($row["id"] == $last_id)?"selected ":"",$row["id"], $row["login"]);
|
||||
}
|
||||
$user_form .= '
|
||||
</select>
|
||||
@ -79,13 +78,13 @@ if ($auth && !$admin) {
|
||||
// or user who did last move
|
||||
$userid = $last_id;
|
||||
}
|
||||
$query = "SELECT * FROM trips WHERE FK_Users_ID='$userid' ORDER BY ID DESC";
|
||||
$query = "SELECT * FROM tracks WHERE user_id='$userid' ORDER BY id DESC";
|
||||
$result = $mysqli->query($query);
|
||||
|
||||
$trackid = "";
|
||||
while ($row = $result->fetch_assoc()) {
|
||||
if ($trackid == "") { $trackid = $row["ID"]; } // get first row
|
||||
$track_form .= sprintf("<option value=\"%s\">%s</option>\n", $row["ID"], $row["Name"]);
|
||||
if ($trackid == "") { $trackid = $row["id"]; } // get first row
|
||||
$track_form .= sprintf("<option value=\"%s\">%s</option>\n", $row["id"], $row["name"]);
|
||||
}
|
||||
$track_form .= '
|
||||
</select>
|
||||
@ -111,6 +110,7 @@ $lang_form = '
|
||||
<option value="en"'.(($lang=="en")?' selected':'').'>English</option>
|
||||
<option value="pl"'.(($lang=="pl")?' selected':'').'>Polski</option>
|
||||
<option value="de"'.(($lang=="de")?' selected':'').'>Deutsch</option>
|
||||
<option value="hu"'.(($lang=="hu")?' selected':'').'>Magyar</option>
|
||||
</select>
|
||||
</form>
|
||||
';
|
||||
@ -140,6 +140,7 @@ print
|
||||
var lang_user = "'.$lang_user.'";
|
||||
var lang_time = "'.$lang_time.'";
|
||||
var lang_speed = "'.$lang_speed.'";
|
||||
var lang_accuracy = "'.$lang_accuracy.'";
|
||||
var lang_altitude = "'.$lang_altitude.'";
|
||||
var lang_ttime = "'.$lang_ttime.'";
|
||||
var lang_aspeed = "'.$lang_aspeed.'";
|
||||
@ -187,7 +188,7 @@ print '
|
||||
<div id="user">
|
||||
'.$user_form.'
|
||||
</div>
|
||||
<div id="trip">
|
||||
<div id="track">
|
||||
'.$track_form.'
|
||||
<input type="checkbox" onchange="autoReload();"> '.$lang_autoreload.' (<a href="javascript:void(0);" onclick="setTime()"><span id="auto">'.$interval.'</span></a> s)<br />
|
||||
<a href="javascript:void(0);" onclick="loadTrack(userid,trackid,0)">'.$lang_reload.'</a><br />
|
||||
@ -212,7 +213,7 @@ print '
|
||||
</div>
|
||||
</div>
|
||||
<div id="menu-close" onclick="toggleMenu();">»</div>
|
||||
<div id="footer"><a target="_blank" href="https://github.com/bfabiszewski/phpTrackme">phpTrackme</a> '.$version.'</div>
|
||||
<div id="footer"><a target="_blank" href="https://github.com/bfabiszewski/ulogger-server"><span class="mi">μ</span>logger</a> '.$version.'</div>
|
||||
</div>
|
||||
<div id="main">
|
||||
<div id="map-canvas"></div>
|
||||
|
16
lang.php
16
lang.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -20,7 +20,7 @@
|
||||
switch($lang) {
|
||||
default:
|
||||
case "en":
|
||||
$lang_title = "• phpTrackme •";
|
||||
$lang_title = "• μlogger •";
|
||||
$lang_private = "You need login and password to access this page.";
|
||||
$lang_authfail = "Wrong username or password";
|
||||
$lang_user = "User";
|
||||
@ -33,6 +33,7 @@ switch($lang) {
|
||||
$lang_close = "close";
|
||||
$lang_time = "Time";
|
||||
$lang_speed = "Speed";
|
||||
$lang_accuracy = "Accuracy";
|
||||
$lang_altitude = "Altitude";
|
||||
$lang_ttime = "Total time";
|
||||
$lang_aspeed = "Average speed";
|
||||
@ -55,7 +56,7 @@ switch($lang) {
|
||||
break;
|
||||
|
||||
case "pl":
|
||||
$lang_title = "• phpTrackme •";
|
||||
$lang_title = "• μlogger •";
|
||||
$lang_private = "Aby się zalogować musisz podać login i hasło";
|
||||
$lang_authfail = "błędny login lub hasło";
|
||||
$lang_user = "Użytkownik";
|
||||
@ -68,6 +69,7 @@ switch($lang) {
|
||||
$lang_close = "zamknij";
|
||||
$lang_time = "Czas";
|
||||
$lang_speed = "Prędkość";
|
||||
$lang_accuracy = "Doładność";
|
||||
$lang_altitude = "Wysokość";
|
||||
$lang_ttime = "Czas podróży";
|
||||
$lang_aspeed = "Średnia prędkość";
|
||||
@ -90,7 +92,7 @@ switch($lang) {
|
||||
break;
|
||||
|
||||
case "de":
|
||||
$lang_title = "• phpTrackme •";
|
||||
$lang_title = "• μlogger •";
|
||||
$lang_private = "Sie müssen Benutzernamen und Kennwort eingeben, um auf diese Seite zuzugreifen.";
|
||||
$lang_authfail = "Falscher Benutzername oder Passwort";
|
||||
$lang_user = "Benutzer";
|
||||
@ -103,6 +105,7 @@ switch($lang) {
|
||||
$lang_close = "Schließen";
|
||||
$lang_time = "Zeit";
|
||||
$lang_speed = "Geschwindigkeit";
|
||||
$lang_accuracy = "Genauigkeit";
|
||||
$lang_altitude = "Höhe";
|
||||
$lang_ttime = "Gesamte Zeit";
|
||||
$lang_aspeed = "Durchschnittstempo";
|
||||
@ -125,7 +128,7 @@ switch($lang) {
|
||||
break;
|
||||
|
||||
case "hu":
|
||||
$lang_title = "• phpTrackme •";
|
||||
$lang_title = "• μlogger •";
|
||||
$lang_private = "Felhasználónév és jelszó szükséges a belépéshez";
|
||||
$lang_authfail = "Hibás név vagy jelszó";
|
||||
$lang_user = "Felhasználó";
|
||||
@ -138,6 +141,7 @@ switch($lang) {
|
||||
$lang_close = "Bezár";
|
||||
$lang_time = "Rögzítés ideje";
|
||||
$lang_speed = "Sebesség";
|
||||
$lang_accuracy = "Pontosság";
|
||||
$lang_altitude = "Magasság";
|
||||
$lang_ttime = "Menetidő";
|
||||
$lang_aspeed = "Átlagsebesség";
|
||||
|
10
logout.php
10
logout.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -17,11 +17,11 @@
|
||||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
session_name('trackme');
|
||||
session_name('ulogger');
|
||||
session_start();
|
||||
$_SESSION = NULL;
|
||||
if (isset($_COOKIE[session_name('trackme')])) {
|
||||
setcookie(session_name('trackme'),'',time()-42000,'/');
|
||||
if (isset($_COOKIE[session_name('ulogger')])) {
|
||||
setcookie(session_name('ulogger'),'',time()-42000,'/');
|
||||
}
|
||||
session_destroy();
|
||||
$ssl = ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == "" || $_SERVER['HTTPS'] == "off") ? "http" : "https");
|
||||
|
12
main.css
12
main.css
@ -1,6 +1,6 @@
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -99,7 +99,7 @@ select {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#user, #trip, #summary, #export, #other, #units {
|
||||
#user, #track, #summary, #export, #other, #units {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
#login {
|
||||
@ -181,3 +181,9 @@ select {
|
||||
#close a, #close:link, #close:visited {
|
||||
color: #5070af;
|
||||
}
|
||||
|
||||
.mi {
|
||||
color:white;
|
||||
padding-right:0.1em;
|
||||
font-style:italic;
|
||||
}
|
||||
|
31
main.js
31
main.js
@ -1,6 +1,6 @@
|
||||
/* phpTrackme
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library General Public License as published by
|
||||
@ -141,6 +141,8 @@ function parsePosition(p) {
|
||||
if (speed != null) { speed = parseInt(speed); }
|
||||
var angle = getNode(p,'angle'); // may be null
|
||||
if (angle != null) { angle = parseInt(angle); }
|
||||
var accuracy = getNode(p,'accuracy'); // may be null
|
||||
if (accuracy != null) { accuracy = parseInt(accuracy); }
|
||||
var comments = getNode(p,'comments'); // may be null
|
||||
var username = getNode(p,'username');
|
||||
var trackname = getNode(p,'trackname');
|
||||
@ -154,6 +156,7 @@ function parsePosition(p) {
|
||||
'altitude': altitude,
|
||||
'speed': speed,
|
||||
'angle': angle,
|
||||
'accuracy': accuracy,
|
||||
'comments': comments,
|
||||
'username': username,
|
||||
'trackname': trackname,
|
||||
@ -235,18 +238,18 @@ function selectUser(f) {
|
||||
}
|
||||
document.getElementById('latest').checked = false;
|
||||
if (latest==1) { toggleLatest(); }
|
||||
getTrips(userid);
|
||||
getTracks(userid);
|
||||
}
|
||||
|
||||
function getTrips(userid) {
|
||||
function getTracks(userid) {
|
||||
var xhr = getXHR();
|
||||
xhr.onreadystatechange = function() {
|
||||
if (xhr.readyState==4 && xhr.status==200) {
|
||||
var xml = xhr.responseXML;
|
||||
var trackSelect = document.getElementsByName('track')[0];
|
||||
clearOptions(trackSelect);
|
||||
var trips = xml.getElementsByTagName('trip');
|
||||
if (trips.length>0) {
|
||||
var tracks = xml.getElementsByTagName('track');
|
||||
if (tracks.length>0) {
|
||||
fillOptions(xml);
|
||||
} else {
|
||||
clearMap();
|
||||
@ -254,23 +257,23 @@ function getTrips(userid) {
|
||||
xhr = null;
|
||||
}
|
||||
}
|
||||
xhr.open('GET','gettrips.php?userid='+userid,true);
|
||||
xhr.open('GET','gettracks.php?userid='+userid,true);
|
||||
xhr.send();
|
||||
}
|
||||
|
||||
function fillOptions(xml) {
|
||||
var trackSelect = document.getElementsByName('track')[0];
|
||||
var trips = xml.getElementsByTagName('trip');
|
||||
var trpLen = trips.length;
|
||||
for (var i=0; i<trpLen; i++) {
|
||||
var trackid = getNode(trips[i],'trackid');
|
||||
var trackname = getNode(trips[i],'trackname');
|
||||
var tracks = xml.getElementsByTagName('track');
|
||||
var trackLen = tracks.length;
|
||||
for (var i=0; i<trackLen; i++) {
|
||||
var trackid = getNode(tracks[i],'trackid');
|
||||
var trackname = getNode(tracks[i],'trackname');
|
||||
var option = document.createElement("option");
|
||||
option.value = trackid;
|
||||
option.innerHTML = trackname;
|
||||
trackSelect.appendChild(option);
|
||||
}
|
||||
var defaultTrack = getNode(trips[0],'trackid');
|
||||
var defaultTrack = getNode(tracks[0],'trackid');
|
||||
loadTrack(userid,defaultTrack,1);
|
||||
}
|
||||
|
||||
@ -387,7 +390,7 @@ function setCookie(name,value,days) {
|
||||
else {
|
||||
var expires = '';
|
||||
}
|
||||
document.cookie = 'phpTrackme_'+name+'='+value+expires+'; path=/';
|
||||
document.cookie = 'ulogger_'+name+'='+value+expires+'; path=/';
|
||||
}
|
||||
|
||||
function setLang(lang) {
|
||||
|
281
requests.php
281
requests.php
@ -1,281 +0,0 @@
|
||||
<?php
|
||||
/* phpTrackme
|
||||
*
|
||||
* Copyright(C) 2013 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library 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 Library General Public
|
||||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
// TrackMe API
|
||||
// http://forum.xda-developers.com/showpost.php?p=3250539&postcount=2
|
||||
|
||||
require_once("config.php");
|
||||
$user = (isset($_REQUEST['u']) ? $_REQUEST['u'] : "");
|
||||
$pass = (isset($_REQUEST['p']) ? md5($salt.$_REQUEST['p']) : "");
|
||||
$requireddb = (isset($_REQUEST['db']) ? $_REQUEST['db'] : 0);
|
||||
$tripname = (isset($_REQUEST['tn']) ? $_REQUEST['tn'] : "");
|
||||
$action = (isset($_REQUEST['a']) ? $_REQUEST['a'] : "");
|
||||
|
||||
// If the client uses Backitude then define the tripname as user-date
|
||||
if ($requireddb == 'backitude') {
|
||||
$tripname = $user.'-'.date("Ymd");
|
||||
}
|
||||
// FIXME what is it for?
|
||||
elseif ($requireddb<8) {
|
||||
//Result:5 Incompatible database.
|
||||
quit(5);
|
||||
}
|
||||
|
||||
$mysqli = new mysqli($dbhost, $dbuser, $dbpass, $dbname);
|
||||
if ($mysqli->connect_errno) {
|
||||
//Result:4 Unable to connect database.
|
||||
quit(4);
|
||||
}
|
||||
|
||||
if ((!$user) || (!$pass)){
|
||||
//Result:3 User or password not specified.
|
||||
quit(3);
|
||||
}
|
||||
|
||||
$query = $mysqli->prepare("SELECT ID,username,password FROM users WHERE username=? LIMIT 1");
|
||||
$query->bind_param('s', $user);
|
||||
$query->execute();
|
||||
$query->store_result();
|
||||
$query->bind_result($userid, $rec_user, $rec_pass);
|
||||
$query->fetch();
|
||||
$num = $query->num_rows;
|
||||
$query->free_result();
|
||||
$query->close();
|
||||
if ($num) {
|
||||
if (($user==$rec_user) && ($pass!=$rec_pass)) {
|
||||
//Result:1 User correct, invalid password.
|
||||
quit(1);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ($allow_registration) {
|
||||
// User unknown, let's create it
|
||||
$query = $mysqli->prepare("INSERT INTO users (username,password) VALUES (?,?)");
|
||||
$query->bind_param('ss', $user, $pass);
|
||||
$query->execute();
|
||||
$userid = $mysqli->insert_id;
|
||||
$query->close();
|
||||
if (!$userid) {
|
||||
//Result:2 User did not exist but after being created couldn't be found.
|
||||
// Or rather something went wrong while updating database
|
||||
quit(2);
|
||||
}
|
||||
}
|
||||
else {
|
||||
// User unknown, we don't allow autoregistration
|
||||
// Let's use this one:
|
||||
//Result:1 User correct, invalid password.
|
||||
quit(1);
|
||||
}
|
||||
}
|
||||
|
||||
switch($action) {
|
||||
// action: noop
|
||||
case "noop":
|
||||
// test
|
||||
quit(0);
|
||||
break;
|
||||
|
||||
// action: deletetrip
|
||||
case "deletetrip":
|
||||
if ($tripname) {
|
||||
$sql = "DELETE FROM positions LEFT JOIN trips ON positions.FK_Trips_ID=trips.ID "
|
||||
."WHERE positions.FK_Users_ID=? AND trips.Name=?";
|
||||
$query = $mysqli->prepare($sql);
|
||||
if ($query) {
|
||||
$query->bind_param('is', $userid, $tripname);
|
||||
$query->execute();
|
||||
$query->close();
|
||||
}
|
||||
$sql = "DELETE FROM trips WHERE FK_Users_ID=? AND Name=?";
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('is', $userid, $tripname);
|
||||
$query->execute();
|
||||
$rows = $mysqli->affected_rows;
|
||||
$query->close();
|
||||
if ($rows) {
|
||||
quit(0);
|
||||
}
|
||||
else {
|
||||
//Result:7 Trip not found
|
||||
quit(7);
|
||||
}
|
||||
}
|
||||
else {
|
||||
//Result:6 Trip not specified.
|
||||
quit(6);
|
||||
}
|
||||
break;
|
||||
|
||||
// action: addtrip
|
||||
case "addtrip":
|
||||
if ($tripname) {
|
||||
$sql = "INSERT INTO trips (FK_Users_ID,Name) VALUES (?,?)";
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('is', $userid, $tripname);
|
||||
$query->execute();
|
||||
$query->close();
|
||||
}
|
||||
else {
|
||||
//Result:6 Trip not specified.
|
||||
quit(6);
|
||||
}
|
||||
break;
|
||||
|
||||
// action: gettriplist
|
||||
case "gettriplist":
|
||||
$sql = "SELECT a1.Name,(SELECT MIN(a2.DateOccurred) FROM positions a2 "
|
||||
."WHERE a2.FK_Trips_ID=a1.ID) AS startdate "
|
||||
."FROM trips a1 WHERE a1.FK_Users_ID=? ORDER BY Name";
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('i', $userid);
|
||||
$query->execute();
|
||||
$query->store_result();
|
||||
$query->bind_result($tripname,$startdate);
|
||||
$num = $query->num_rows;
|
||||
$triplist = array();
|
||||
if ($num) {
|
||||
while ($query->fetch()) {
|
||||
$triplist[] = $tripname."|".$startdate;
|
||||
}
|
||||
}
|
||||
$query->free_result();
|
||||
$query->close();
|
||||
$param = implode("\n",$triplist);
|
||||
quit(0,$param);
|
||||
break;
|
||||
|
||||
// action: upload
|
||||
case "upload":
|
||||
$lat = isset($_REQUEST["lat"]) ? $_REQUEST["lat"] : NULL;
|
||||
$long = isset($_REQUEST["long"]) ? $_REQUEST["long"] : NULL;
|
||||
// If the client uses Backitude then convert the date into handled format
|
||||
$dateoccurred = isset($_REQUEST["do"]) ? $_REQUEST["do"] : NULL;
|
||||
$altitude = isset($_REQUEST["alt"]) ? $_REQUEST["alt"] : NULL;
|
||||
$angle = isset($_REQUEST["ang"]) ? $_REQUEST["ang"] : NULL;
|
||||
$speed = isset($_REQUEST["sp"]) ? $_REQUEST["sp"] : NULL;
|
||||
$iconname = isset($_REQUEST["iconname"]) ? $_REQUEST["iconname"] : NULL;
|
||||
$comments = isset($_REQUEST["comments"]) ? $_REQUEST["comments"] : NULL;
|
||||
$imageurl = isset($_REQUEST["imageurl"]) ? $_REQUEST["imageurl"] : NULL;
|
||||
$cellid = isset($_REQUEST["cid"]) ? $_REQUEST["cid"] : NULL;
|
||||
$signalstrength = isset($_REQUEST["ss"]) ? $_REQUEST["ss"] : NULL;
|
||||
$signalstrengthmax = isset($_REQUEST["ssmax"]) ? $_REQUEST["ssmax"] : NULL;
|
||||
$signalstrengthmin = isset($_REQUEST["ssmin"]) ? $_REQUEST["ssmin"] : NULL;
|
||||
$batterystatus = isset($_REQUEST["bs"]) ? $_REQUEST["bs"] : NULL;
|
||||
$uploadss = isset($_REQUEST["upss"]) ? $_REQUEST["upss"] : NULL; // FIXME is it needed?
|
||||
$iconid = NULL;
|
||||
if ($iconname) {
|
||||
$sql = "SELECT ID FROM icons WHERE Name=? LIMIT 1";
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('s', $iconname);
|
||||
$query->execute();
|
||||
$query->store_result();
|
||||
$query->bind_result($id);
|
||||
$query->fetch();
|
||||
$num = $query->num_rows;
|
||||
$query->free_result();
|
||||
$query->close();
|
||||
if ($num) {
|
||||
$iconid = $id;
|
||||
}
|
||||
}
|
||||
$tripid = NULL; // FIXME: not sure what trips with null id are
|
||||
if ($tripname) {
|
||||
// get tripid
|
||||
$query = $mysqli->prepare("SELECT ID FROM trips WHERE FK_Users_ID=? AND Name=? LIMIT 1");
|
||||
$query->bind_param('is', $userid, $tripname);
|
||||
$query->execute();
|
||||
$query->store_result();
|
||||
$query->bind_result($tripid);
|
||||
$query->fetch();
|
||||
$num = $query->num_rows;
|
||||
$query->free_result();
|
||||
$query->close();
|
||||
if (!$num) {
|
||||
// create trip
|
||||
$query = $mysqli->prepare("INSERT INTO trips (FK_Users_ID,Name) VALUES (?,?)");
|
||||
$query->bind_param('is', $userid, $tripname);
|
||||
$query->execute();
|
||||
$tripid = $mysqli->insert_id;
|
||||
$query->close();
|
||||
if (!$tripid) {
|
||||
//Result:6 Trip didn't exist and system was unable to create it.
|
||||
quit(6);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($requireddb == 'backitude') {
|
||||
$sql = "INSERT INTO positions "
|
||||
."(FK_Users_ID,FK_Trips_ID,Latitude,Longitude,DateOccurred,FK_Icons_ID,"
|
||||
."Speed,Altitude,Comments,ImageURL,Angle,SignalStrength,SignalStrengthMax,"
|
||||
."SignalStrengthMin,BatteryStatus) VALUES (?,?,?,?,FROM_UNIXTIME(?),?,?,?,?,?,?,?,?,?,?)";
|
||||
} else {
|
||||
$sql = "INSERT INTO positions "
|
||||
."(FK_Users_ID,FK_Trips_ID,Latitude,Longitude,DateOccurred,FK_Icons_ID,"
|
||||
."Speed,Altitude,Comments,ImageURL,Angle,SignalStrength,SignalStrengthMax,"
|
||||
."SignalStrengthMin,BatteryStatus) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
|
||||
}
|
||||
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('iiddsiddssdiiii',
|
||||
$userid,$tripid,$lat,$long,$dateoccurred,$iconid,
|
||||
$speed,$altitude,$comments,$imageurl,$angle,$signalstrength,$signalstrengthmax,
|
||||
$signalstrengthmin,$batterystatus);
|
||||
$query->execute();
|
||||
$query->close();
|
||||
if ($mysqli->errno) {
|
||||
//Result:7|SQLERROR Insert statement failed.
|
||||
quit(7,$mysqli->error);
|
||||
}
|
||||
//FIXME Are cellids used in Android client?
|
||||
$upcellext = isset($_REQUEST["upcellext"]) ? $_REQUEST["upcellext"] : NULL;
|
||||
if ($upcellext==1 && $cellid) {
|
||||
$sql = "INSERT INTO cellids (CellID,Latitude,Longitude,SignalStrength,SignalStrengthMax,SignalStrengthMin) "
|
||||
."VALUES (?,?,?,?,?,?)";
|
||||
$query = $mysqli->prepare($sql);
|
||||
$query->bind_param('sddiii',$cellid,$lat,$long,$signalstrength,$signalstrengthmax,$signalstrengthmin);
|
||||
$query->execute();
|
||||
$query->close();
|
||||
if ($mysqli->errno) {
|
||||
//Result:7|SQLERROR Insert statement failed.
|
||||
quit(7,$mysqli->error);
|
||||
}
|
||||
}
|
||||
quit(0);
|
||||
break;
|
||||
|
||||
// action: geticonlist
|
||||
// action: renametrip
|
||||
// action: findclosestbuddy
|
||||
// action: delete
|
||||
// action: sendemail
|
||||
// action: updateimageurl
|
||||
// action: findclosestpositionbytime
|
||||
// action: findclosestpositionbyposition
|
||||
// action: gettripinfo
|
||||
// action: gettriphighlights
|
||||
}
|
||||
|
||||
function quit($errno,$param=""){
|
||||
print "Result:".$errno.(($param)?"|$param":"");
|
||||
exit();
|
||||
}
|
||||
|
||||
$mysqli->close();
|
||||
?>
|
200
scripts/migrate_from_phptrackme.php
Normal file
200
scripts/migrate_from_phptrackme.php
Normal file
@ -0,0 +1,200 @@
|
||||
<?php
|
||||
/* μlogger
|
||||
*
|
||||
* Copyright(C) 2017 Bartek Fabiszewski (www.fabiszewski.net)
|
||||
*
|
||||
* This is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Library 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 Library General Public
|
||||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
/* This script imports data from old phpTrackme database scheme.
|
||||
*
|
||||
* However, as μlogger users more secure password storage methods,
|
||||
* it is impossible to convert old password hashes to the new format.
|
||||
* Administrator will have to fill in user passwords manually.
|
||||
* Alternatively authentication code could be modify in order to
|
||||
* temporarily accept old hashes and convert it as users log in.
|
||||
* It should be pretty simple, but this is not a top priority
|
||||
* for this small project.
|
||||
*/
|
||||
|
||||
// this script is disabled by default. Change below to true before running.
|
||||
$enabled = false;
|
||||
|
||||
// path to root folder of phpTrackme
|
||||
$phpTrackmePath = "../../phpTrackme";
|
||||
|
||||
// path to root folder of μlogger
|
||||
$uloggerPath = "..";
|
||||
|
||||
|
||||
/* -------------------------------------------- */
|
||||
/* no user modifications should be needed below */
|
||||
|
||||
if ($enabled == false) {
|
||||
echo "Script is disabled\n";
|
||||
exit(1);
|
||||
}
|
||||
$path = realpath(dirname(__FILE__));
|
||||
if (!empty($phpTrackmePath) && $phpTrackmePath[0] == ".") {
|
||||
$phpTrackmePath = $path . "/" . $phpTrackmePath;
|
||||
}
|
||||
$phpTrackmeConfig = $phpTrackmePath . "/config.php";
|
||||
if (!is_readable($phpTrackmeConfig)) {
|
||||
echo "Can't find phpTrackme config file: $phpTrackmeConfig\n";
|
||||
exit(1);
|
||||
}
|
||||
include ($phpTrackmeConfig);
|
||||
$pt_dbhost = $dbhost;
|
||||
$pt_dbuser = $dbuser;
|
||||
$pt_dbpass = $dbpass;
|
||||
$pt_dbname = $dbname;
|
||||
$pt_mysqli = new mysqli($pt_dbhost, $pt_dbuser, $pt_dbpass, $pt_dbname);
|
||||
$pt_mysqli->set_charset("utf8");
|
||||
if ($pt_mysqli->connect_errno) {
|
||||
echo "Can't connect to $pt_dbname database: (" . $pt_mysqli->errno . ") " . $pt_mysqli->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
if (!empty($uloggerPath) && $uloggerPath[0] == ".") {
|
||||
$uloggerPath = $path . "/" . $uloggerPath;
|
||||
}
|
||||
$uloggerConfig = $uloggerPath . "/config.php";
|
||||
if (!is_readable($uloggerConfig)) {
|
||||
echo "Can't find μlogger config fiel: $uloggerConfige\n";
|
||||
exit(1);
|
||||
}
|
||||
include ($uloggerConfig);
|
||||
$mysqli = new mysqli($dbhost, $dbuser, $dbpass, $dbname);
|
||||
$mysqli->set_charset("utf8");
|
||||
if ($mysqli->connect_errno) {
|
||||
echo "Can't connect to $dbname database : (" . $mysqli->errno . ") " . $mysqli->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// import data
|
||||
if (!$users_result = $pt_mysqli->query("SELECT * FROM users ORDER BY ID")) {
|
||||
echo "Query failed\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (!($user_insert = $mysqli->prepare("INSERT INTO users (login, password) VALUES (?, ?)"))) {
|
||||
echo "Prepare failed: (" . $mysqli->errno . ") " . $mysqli->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
$pt_user = null;
|
||||
$pt_pass = null;
|
||||
if (!$user_insert->bind_param("ss", $pt_user, $pt_pass)) {
|
||||
echo "Binding parameters failed: (" . $user_insert->errno . ") " . $user_insert->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
while ($user = $users_result->fetch_assoc()) {
|
||||
$pt_user = $user['username'];
|
||||
$pt_pass = $user['password'];
|
||||
$pt_id = $user['ID'];
|
||||
if (!$user_insert->execute()) {
|
||||
echo "Execute failed: (" . $user_insert->errno . ") " . $user_insert->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
$user_id = $user_insert->insert_id;
|
||||
process_user_tracks($user_id);
|
||||
}
|
||||
|
||||
function process_user_tracks($user_id) {
|
||||
global $pt_mysqli, $mysqli;
|
||||
$sql = "SELECT * FROM trips WHERE FK_Users_ID = ? ORDER BY ID";
|
||||
if (!($tracks_select = $pt_mysqli->prepare($sql))) {
|
||||
echo "Prepare failed: (" . $pt_mysqli->errno . ") " . $pt_mysqli->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
if (!$tracks_select->bind_param('i', $user_id)) {
|
||||
echo "Binding parameters failed: (" . $tracks_select->errno . ") " . $tracks_select->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
if (!$tracks_select->execute()) {
|
||||
echo "Execute failed: (" . $tracks_select->errno . ") " . $tracks_select->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
if (!($track_insert = $mysqli->prepare("INSERT INTO tracks (user_id, name, comment) VALUES (?, ?, ?)"))) {
|
||||
echo "Prepare failed: (" . $mysqli->errno . ") " . $mysqli->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
$pt_name = null;
|
||||
$pt_comment = null;
|
||||
if (!$track_insert->bind_param("iss", $user_id, $pt_name, $pt_comment)) {
|
||||
echo "Binding parameters failed: (" . $track_insert->errno . ") " . $track_insert->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
$result = $tracks_select->get_result();
|
||||
while ($track = $result->fetch_assoc()) {
|
||||
$pt_name = $track['Name'];
|
||||
$pt_comment = $track['Comments'];
|
||||
if (!$track_insert->execute()) {
|
||||
echo "Execute failed: (" . $track_insert->errno . ") " . $track_insert->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
$track_id = $track_insert->insert_id;
|
||||
process_track($user_id, $track_id);
|
||||
}
|
||||
}
|
||||
|
||||
function process_track($user_id, $track_id) {
|
||||
global $pt_mysqli, $mysqli;
|
||||
$sql = "SELECT * FROM positions WHERE FK_Users_ID = ? AND FK_Trips_ID = ? ORDER BY DateOccurred";
|
||||
if (!($pos_select = $pt_mysqli->prepare($sql))) {
|
||||
echo "Prepare failed: (" . $pt_mysqli->errno . ") " . $pt_mysqli->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
if (!$pos_select->bind_param('ii', $user_id, $track_id)) {
|
||||
echo "Binding parameters failed: (" . $pos_select->errno . ") " . $pos_select->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
if (!$pos_select->execute()) {
|
||||
echo "Execute failed: (" . $pos_select->errno . ") " . $pos_select->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
if (!($pos_insert = $mysqli->prepare("INSERT INTO positions (time, user_id, track_id, latitude, longitude, altitude, speed, bearing, accuracy, provider, comment, image_id)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"))) {
|
||||
echo "Prepare failed: (" . $mysqli->errno . ") " . $mysqli->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
$provider = $comment = $time = $imageid = null;
|
||||
$lat = $lon = 0;
|
||||
$altitude = $speed = $bearing = $accuracy = null;
|
||||
|
||||
if (!$pos_insert->bind_param('siiddddddssi',
|
||||
$time, $user_id, $track_id, $lat, $lon, $altitude, $speed, $bearing, $accuracy, $provider, $comment, $imageid)) {
|
||||
echo "Binding parameters failed: (" . $pos_insert->errno . ") " . $pos_insert->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
$result = $pos_select->get_result();
|
||||
while ($track = $result->fetch_assoc()) {
|
||||
$provider = null;
|
||||
$comment = $track['Comments'];
|
||||
$time = $track['DateOccurred'];
|
||||
$lat = $track['Latitude'];
|
||||
$lon = $track['Longitude'];
|
||||
$altitude = $track['Altitude'];
|
||||
$speed = $track['Speed'];
|
||||
$bearing = $track['Angle'];
|
||||
if (!$pos_insert->execute()) {
|
||||
echo "Execute failed: (" . $pos_insert->errno . ") " . $pos_insert->error . "\n";
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
echo "Import finished successfully\n";
|
||||
exit(0);
|
||||
?>
|
95
scripts/ulogger.sql
Executable file
95
scripts/ulogger.sql
Executable file
@ -0,0 +1,95 @@
|
||||
--
|
||||
-- Database: `ulogger`
|
||||
--
|
||||
|
||||
CREATE DATABASE IF NOT EXISTS `ulogger` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
|
||||
USE `ulogger`;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `positions`
|
||||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `positions` (
|
||||
`id` int(11) NOT NULL,
|
||||
`time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`user_id` int(11) NOT NULL,
|
||||
`track_id` int(11) NOT NULL,
|
||||
`latitude` double NOT NULL,
|
||||
`longitude` double NOT NULL,
|
||||
`altitude` double DEFAULT NULL,
|
||||
`speed` double DEFAULT NULL,
|
||||
`bearing` double DEFAULT NULL,
|
||||
`accuracy` int(11) DEFAULT NULL,
|
||||
`provider` varchar(100) DEFAULT NULL,
|
||||
`comment` varchar(255) DEFAULT NULL,
|
||||
`image_id` int(11) DEFAULT NULL
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `tracks`
|
||||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `tracks` (
|
||||
`id` int(11) NOT NULL,
|
||||
`user_id` int(11) NOT NULL,
|
||||
`name` varchar(255) DEFAULT NULL,
|
||||
`comment` varchar(1024) DEFAULT NULL
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `users`
|
||||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `users` (
|
||||
`id` int(11) NOT NULL,
|
||||
`login` varchar(15) CHARACTER SET latin1 NOT NULL,
|
||||
`password` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT ''
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
--
|
||||
-- Indexes for dumped tables
|
||||
--
|
||||
|
||||
--
|
||||
-- Indexes for table `positions`
|
||||
--
|
||||
ALTER TABLE `positions`
|
||||
ADD PRIMARY KEY (`id`), ADD KEY `index_trip_id` (`track_id`), ADD KEY `index_user_id` (`user_id`);
|
||||
|
||||
--
|
||||
-- Indexes for table `tracks`
|
||||
--
|
||||
ALTER TABLE `tracks`
|
||||
ADD PRIMARY KEY (`id`), ADD KEY `user_id` (`user_id`);
|
||||
|
||||
--
|
||||
-- Indexes for table `users`
|
||||
--
|
||||
ALTER TABLE `users`
|
||||
ADD PRIMARY KEY (`id`), ADD UNIQUE KEY `login` (`login`);
|
||||
|
||||
--
|
||||
-- AUTO_INCREMENT for dumped tables
|
||||
--
|
||||
|
||||
--
|
||||
-- AUTO_INCREMENT for table `positions`
|
||||
--
|
||||
ALTER TABLE `positions`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `tracks`
|
||||
--
|
||||
ALTER TABLE `tracks`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `users`
|
||||
--
|
||||
ALTER TABLE `users`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
|
134
trackme.sql
134
trackme.sql
@ -1,134 +0,0 @@
|
||||
--
|
||||
-- Database layout inherited from TrackMe
|
||||
-- Some tables/columns are not used by the viewer at the moment.
|
||||
-- Kept for compatibility with old data.
|
||||
--
|
||||
|
||||
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
|
||||
SET time_zone = "+00:00";
|
||||
CREATE DATABASE IF NOT EXISTS `trackme` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
|
||||
USE `trackme`;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `cellids` (
|
||||
`ID` int(11) NOT NULL auto_increment,
|
||||
`CellID` varchar(255) NOT NULL,
|
||||
`Latitude` double NOT NULL,
|
||||
`Longitude` double NOT NULL,
|
||||
`DateAdded` timestamp NOT NULL default CURRENT_TIMESTAMP,
|
||||
`SignalStrength` int(11) default NULL,
|
||||
`SignalStrengthMax` int(11) default NULL,
|
||||
`SignalStrengthMin` int(11) default NULL,
|
||||
PRIMARY KEY (`ID`),
|
||||
KEY `Index_CellID` (`CellID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `icons` (
|
||||
`ID` int(11) NOT NULL auto_increment,
|
||||
`Name` varchar(255) NOT NULL,
|
||||
`URL` varchar(512) NOT NULL,
|
||||
PRIMARY KEY (`ID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `positions` (
|
||||
`ID` int(11) NOT NULL auto_increment,
|
||||
`FK_Users_ID` int(11) NOT NULL,
|
||||
`FK_Trips_ID` int(11) default NULL,
|
||||
`FK_Icons_ID` int(11) default NULL,
|
||||
`Latitude` double NOT NULL,
|
||||
`Longitude` double NOT NULL,
|
||||
`Altitude` double default '0',
|
||||
`Speed` double default '0',
|
||||
`Angle` double default NULL,
|
||||
`DateAdded` timestamp NOT NULL default CURRENT_TIMESTAMP,
|
||||
`DateOccurred` timestamp NULL default '0000-00-00 00:00:00',
|
||||
`Comments` varchar(255) default NULL,
|
||||
`ImageURL` varchar(255) default NULL,
|
||||
`SignalStrength` int(11) default NULL,
|
||||
`SignalStrengthMax` int(11) default NULL,
|
||||
`SignalStrengthMin` int(11) default NULL,
|
||||
`BatteryStatus` tinyint(4) default NULL,
|
||||
PRIMARY KEY (`ID`),
|
||||
KEY `Index_FK_Trips_ID` (`FK_Trips_ID`),
|
||||
KEY `Index_FK_Users_ID` (`FK_Users_ID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `trips` (
|
||||
`ID` int(11) NOT NULL auto_increment,
|
||||
`FK_Users_ID` int(11) NOT NULL,
|
||||
`Name` varchar(255) NOT NULL,
|
||||
`Comments` varchar(1024) default NULL,
|
||||
PRIMARY KEY (`ID`),
|
||||
UNIQUE KEY `Index_FK_Users_ID_Name` (`FK_Users_ID`,`Name`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `users` (
|
||||
`ID` int(11) NOT NULL auto_increment,
|
||||
`username` varchar(15) NOT NULL,
|
||||
`password` varchar(50) NOT NULL default '',
|
||||
PRIMARY KEY (`ID`),
|
||||
UNIQUE KEY `Index_username` (`username`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
INSERT INTO `icons` VALUES (1, 'Snack', 'http://maps.google.com/mapfiles/ms/micons/snack_bar.png');
|
||||
INSERT INTO `icons` VALUES (2, 'Hiking', 'http://maps.google.com/mapfiles/ms/micons/hiker.png');
|
||||
INSERT INTO `icons` VALUES (3, 'Lodging', 'http://maps.google.com/mapfiles/ms/micons/lodging.png');
|
||||
INSERT INTO `icons` VALUES (4, 'Restaurant', 'http://maps.google.com/mapfiles/ms/micons/restaurant.png');
|
||||
INSERT INTO `icons` VALUES (5, 'POI', 'http://maps.google.com/mapfiles/ms/micons/POI.png');
|
||||
INSERT INTO `icons` VALUES (6, 'Arts', 'http://maps.google.com/mapfiles/ms/micons/arts.png');
|
||||
INSERT INTO `icons` VALUES (7, 'Bar', 'http://maps.google.com/mapfiles/ms/micons/bar.png');
|
||||
INSERT INTO `icons` VALUES (8, 'Blue-dot', 'http://maps.google.com/mapfiles/ms/micons/blue-dot.png');
|
||||
INSERT INTO `icons` VALUES (9, 'Bus', 'http://maps.google.com/mapfiles/ms/micons/bus.png');
|
||||
INSERT INTO `icons` VALUES (10, 'Taxi', 'http://maps.google.com/mapfiles/ms/micons/cabs.png');
|
||||
INSERT INTO `icons` VALUES (11, 'Camera', 'http://maps.google.com/mapfiles/ms/micons/camera.png');
|
||||
INSERT INTO `icons` VALUES (12, 'Camping', 'http://maps.google.com/mapfiles/ms/micons/campground.png');
|
||||
INSERT INTO `icons` VALUES (13, 'Caution', 'http://maps.google.com/mapfiles/ms/micons/caution.png');
|
||||
INSERT INTO `icons` VALUES (14, 'Coffee House', 'http://maps.google.com/mapfiles/ms/micons/coffeehouse.png');
|
||||
INSERT INTO `icons` VALUES (15, 'Store', 'http://maps.google.com/mapfiles/ms/micons/convienancestore.png');
|
||||
INSERT INTO `icons` VALUES (16, 'Cycling', 'http://maps.google.com/mapfiles/ms/micons/cycling.png');
|
||||
INSERT INTO `icons` VALUES (17, 'Dollar', 'http://maps.google.com/mapfiles/ms/micons/dollar.png');
|
||||
INSERT INTO `icons` VALUES (18, 'Drinking water', 'http://maps.google.com/mapfiles/ms/micons/drinking_water.png');
|
||||
INSERT INTO `icons` VALUES (19, 'Electronics', 'http://maps.google.com/mapfiles/ms/micons/electronics.png');
|
||||
INSERT INTO `icons` VALUES (20, 'Falling Rocks', 'http://maps.google.com/mapfiles/ms/micons/fallingrocks.png');
|
||||
INSERT INTO `icons` VALUES (21, 'Ferry', 'http://maps.google.com/mapfiles/ms/micons/ferry.png');
|
||||
INSERT INTO `icons` VALUES (22, 'Fire Dept.', 'http://maps.google.com/mapfiles/ms/micons/firedept.png');
|
||||
INSERT INTO `icons` VALUES (23, 'Fishing', 'http://maps.google.com/mapfiles/ms/micons/fishing.png');
|
||||
INSERT INTO `icons` VALUES (24, 'Flag', 'http://maps.google.com/mapfiles/ms/micons/flag.png');
|
||||
INSERT INTO `icons` VALUES (25, 'Gas', 'http://maps.google.com/mapfiles/ms/micons/gas.png');
|
||||
INSERT INTO `icons` VALUES (26, 'Grocery Store', 'http://maps.google.com/mapfiles/ms/micons/grocerystore.png');
|
||||
INSERT INTO `icons` VALUES (27, 'Helicopter', 'http://maps.google.com/mapfiles/ms/micons/helicopter.png');
|
||||
INSERT INTO `icons` VALUES (28, 'Horseback riding', 'http://maps.google.com/mapfiles/ms/micons/horsebackriding.png');
|
||||
INSERT INTO `icons` VALUES (29, 'Hospital', 'http://maps.google.com/mapfiles/ms/micons/hospitals.png');
|
||||
INSERT INTO `icons` VALUES (30, 'Hot springs', 'http://maps.google.com/mapfiles/ms/micons/hotsprings.png');
|
||||
INSERT INTO `icons` VALUES (31, 'Info', 'http://maps.google.com/mapfiles/ms/micons/info.png');
|
||||
INSERT INTO `icons` VALUES (32, 'Info 2', 'http://maps.google.com/mapfiles/ms/micons/info_circle.png');
|
||||
INSERT INTO `icons` VALUES (33, 'Man', 'http://maps.google.com/mapfiles/ms/micons/man.png');
|
||||
INSERT INTO `icons` VALUES (34, 'Marina', 'http://maps.google.com/mapfiles/ms/micons/marina.png');
|
||||
INSERT INTO `icons` VALUES (35, 'Mechanic', 'http://maps.google.com/mapfiles/ms/micons/mechanic.png');
|
||||
INSERT INTO `icons` VALUES (36, 'Motorcycling', 'http://maps.google.com/mapfiles/ms/micons/motorcycling.png');
|
||||
INSERT INTO `icons` VALUES (37, 'Parking', 'http://maps.google.com/mapfiles/ms/micons/parkinglot.png');
|
||||
INSERT INTO `icons` VALUES (38, 'Partly Cloudy', 'http://maps.google.com/mapfiles/ms/micons/partly_cloudy.png');
|
||||
INSERT INTO `icons` VALUES (39, 'Phone', 'http://maps.google.com/mapfiles/ms/micons/phone.png');
|
||||
INSERT INTO `icons` VALUES (40, 'Picnic', 'http://maps.google.com/mapfiles/ms/micons/picnic.png');
|
||||
INSERT INTO `icons` VALUES (41, 'Plane', 'http://maps.google.com/mapfiles/ms/micons/plane.png');
|
||||
INSERT INTO `icons` VALUES (42, 'Police', 'http://maps.google.com/mapfiles/ms/micons/police.png');
|
||||
INSERT INTO `icons` VALUES (43, 'Post Office', 'http://maps.google.com/mapfiles/ms/micons/postoffice-us.png');
|
||||
INSERT INTO `icons` VALUES (44, 'Question mark', 'http://maps.google.com/mapfiles/ms/micons/question.png');
|
||||
INSERT INTO `icons` VALUES (45, 'Rail', 'http://maps.google.com/mapfiles/ms/micons/rail.png');
|
||||
INSERT INTO `icons` VALUES (46, 'Rainy', 'http://maps.google.com/mapfiles/ms/micons/rainy.png');
|
||||
INSERT INTO `icons` VALUES (47, 'Ranger Station', 'http://maps.google.com/mapfiles/ms/micons/rangerstation.png');
|
||||
INSERT INTO `icons` VALUES (48, 'Recycle', 'http://maps.google.com/mapfiles/ms/micons/recycle.png');
|
||||
INSERT INTO `icons` VALUES (49, 'Snow', 'http://maps.google.com/mapfiles/ms/micons/snowflake_simple.png');
|
||||
INSERT INTO `icons` VALUES (50, 'Sport', 'http://maps.google.com/mapfiles/ms/micons/sportvenue.png');
|
||||
INSERT INTO `icons` VALUES (51, 'Subway', 'http://maps.google.com/mapfiles/ms/micons/subway.png');
|
||||
INSERT INTO `icons` VALUES (52, 'Sunny', 'http://maps.google.com/mapfiles/ms/micons/sunny.png');
|
||||
INSERT INTO `icons` VALUES (53, 'Swimming', 'http://maps.google.com/mapfiles/ms/micons/swimming.png');
|
||||
INSERT INTO `icons` VALUES (54, 'Toilets', 'http://maps.google.com/mapfiles/ms/micons/toilets.png');
|
||||
INSERT INTO `icons` VALUES (55, 'Trail', 'http://maps.google.com/mapfiles/ms/micons/trail.png');
|
||||
INSERT INTO `icons` VALUES (56, 'Tree', 'http://maps.google.com/mapfiles/ms/micons/tree.png');
|
||||
INSERT INTO `icons` VALUES (57, 'Truck', 'http://maps.google.com/mapfiles/ms/micons/truck.png');
|
||||
INSERT INTO `icons` VALUES (58, 'Volcano', 'http://maps.google.com/mapfiles/ms/micons/volcano.png');
|
||||
INSERT INTO `icons` VALUES (59, 'Water', 'http://maps.google.com/mapfiles/ms/micons/water.png');
|
||||
INSERT INTO `icons` VALUES (60, 'Waterfalls', 'http://maps.google.com/mapfiles/ms/micons/waterfalls.png');
|
||||
INSERT INTO `icons` VALUES (61, 'Wheel Chair', 'http://maps.google.com/mapfiles/ms/micons/wheel_chair_accessible.png');
|
||||
INSERT INTO `icons` VALUES (62, 'Woman', 'http://maps.google.com/mapfiles/ms/micons/woman.png');
|
||||
INSERT INTO `icons` VALUES (63, 'Monster gate', 'http://img.gamespot.com/gamespot/shared/user/emblem_e3monster_s.jpg');
|
Loading…
x
Reference in New Issue
Block a user