deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to work with KH 3.1

Browse Source
This commit is contained in:
Deon George 2011-05-23 20:01:27 +10:00
parent 4765770a1a
commit a244d693b5
28 changed files with 1027 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

841
LICENSE
View File

@ -1,285 +1,626 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 3, 29 June 2007
Copyright (C) 1989, 1991 Free Software Foundation, Inc. Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
Preamble Preamble
The licenses for most software are designed to take away your The GNU General Public License is a free, copyleft license for
freedom to share and change it. By contrast, the GNU General Public software and other kinds of works.
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 The licenses for most software and other practical works are designed
General Public License applies to most of the Free Software to take away your freedom to share and change the works. By contrast,
Foundation's software and to any other program whose authors commit to the GNU General Public License is intended to guarantee your freedom to
using it. (Some other Free Software Foundation software is covered by share and change all versions of a program--to make sure it remains free
the GNU Library General Public License instead.) You can apply it to 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. your programs, too.
When we speak of free software, we are referring to freedom, not When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for 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 them if you wish), that you receive source code or can get it if you
if you want it, that you can change the software or use pieces of it want it, that you can change the software or use pieces of it in new
in new free programs; and that you know you can do these things. free programs, and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid To protect your rights, we need to prevent others from denying you
anyone to deny you these rights or to ask you to surrender the rights. these rights or asking you to surrender the rights. Therefore, you have
These restrictions translate to certain responsibilities for you if you certain responsibilities if you distribute copies of the software, or if
distribute copies of the software, or if you modify it. you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether 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 gratis or for a fee, you must pass on to the recipients the same
you have. You must make sure that they, too, receive or can get the freedoms that you received. You must make sure that they, too, receive
source code. And you must show them these terms so they know their or can get the source code. And you must show them these terms so they
rights. know their rights.
We protect your rights with two steps: (1) copyright the software, and Developers that use the GNU GPL protect your rights with two steps:
(2) offer you this license which gives you legal permission to copy, (1) assert copyright on the software, and (2) offer you this License
distribute and/or modify the software. giving you legal permission to copy, distribute and/or modify it.
Also, for each author's protection and ours, we want to make certain For the developers' and authors' protection, the GPL clearly explains
that everyone understands that there is no warranty for this free that there is no warranty for this free software. For both users' and
software. If the software is modified by someone else and passed on, we authors' sake, the GPL requires that modified versions be marked as
want its recipients to know that what they have is not the original, so changed, so that their problems will not be attributed erroneously to
that any problems introduced by others will not reflect on the original authors of previous versions.
authors' reputations.
Finally, any free program is threatened constantly by software Some devices are designed to deny users access to install or run
patents. We wish to avoid the danger that redistributors of a free modified versions of the software inside them, although the manufacturer
program will individually obtain patent licenses, in effect making the can do so. This is fundamentally incompatible with the aim of
program proprietary. To prevent this, we have made it clear that any protecting users' freedom to change the software. The systematic
patent must be licensed for everyone's free use or not licensed at all. 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 The precise terms and conditions for copying, distribution and
modification follow. modification follow.
GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains 0. Definitions.
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".
Activities other than copying, distribution and modification are not "This License" refers to version 3 of the GNU General Public License.
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.
1. You may copy and distribute verbatim copies of the Program's "Copyright" also means copyright-like laws that apply to other kinds of
source code as you receive it, in any medium, provided that you works, such as semiconductor masks.
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.
You may charge a fee for the physical act of transferring a copy, and "The Program" refers to any copyrightable work licensed under this
you may at your option offer warranty protection in exchange for a fee. 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 To "modify" a work means to copy from or adapt all or part of the work
of it, thus forming a work based on the Program, and copy and in a fashion requiring copyright permission, other than the making of an
distribute such modifications or work under the terms of Section 1 exact copy. The resulting work is called a "modified version" of the
above, provided that you also meet all of these conditions: earlier work or a work "based on" the earlier work.
a) You must cause the modified files to carry prominent notices A "covered work" means either the unmodified Program or a work based
stating that you changed the files and the date of any change. on the Program.
b) You must cause any work that you distribute or publish, that in To "propagate" a work means to do anything with it that, without
whole or in part contains or is derived from the Program or any permission, would make you directly or secondarily liable for
part thereof, to be licensed as a whole at no charge to all third infringement under applicable copyright law, except executing it on a
parties under the terms of this License. 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 To "convey" a work means any kind of propagation that enables other
when run, you must cause it, when started running for such parties to make or receive copies. Mere interaction with a user through
interactive use in the most ordinary way, to print or display an a computer network, with no transfer of a copy, is not conveying.
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.)
These requirements apply to the modified work as a whole. If An interactive user interface displays "Appropriate Legal Notices"
identifiable sections of that work are not derived from the Program, to the extent that it includes a convenient and prominently visible
and can be reasonably considered independent and separate works in feature that (1) displays an appropriate copyright notice, and (2)
themselves, then this License, and its terms, do not apply to those tells the user that there is no warranty for the work (except to the
sections when you distribute them as separate works. But when you extent that warranties are provided), that licensees may convey the
distribute the same sections as part of a whole which is a work based work under this License, and how to view a copy of this License. If
on the Program, the distribution of the whole must be on the terms of the interface presents a list of user commands or options, such as a
this License, whose permissions for other licensees extend to the menu, a prominent item in the list meets this criterion.
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest 1. Source Code.
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.
In addition, mere aggregation of another work not based on the Program The "source code" for a work means the preferred form of the work
with the Program (or with a work based on the Program) on a volume of for making modifications to it. "Object code" means any non-source
a storage or distribution medium does not bring the other work under form of a work.
the scope of this License.
3. You may copy and distribute the Program (or a work based on it, A "Standard Interface" means an interface that either is an official
under Section 2) in object code or executable form under the terms of standard defined by a recognized standards body, or, in the case of
Sections 1 and 2 above provided that you also do one of the following: 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 The "System Libraries" of an executable work include anything, other
source code, which must be distributed under the terms of Sections than the work as a whole, that (a) is included in the normal form of
1 and 2 above on a medium customarily used for software interchange; or, 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 The "Corresponding Source" for a work in object code form means all
years, to give any third party, for a charge no more than your the source code needed to generate, install, and (for an executable
cost of physically performing source distribution, a complete work) run the object code and to modify the work, including scripts to
machine-readable copy of the corresponding source code, to be control those activities. However, it does not include the work's
distributed under the terms of Sections 1 and 2 above on a medium System Libraries, or general-purpose tools or generally available free
customarily used for software interchange; or, 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 The Corresponding Source need not include anything that users
to distribute corresponding source code. (This alternative is can regenerate automatically from other parts of the Corresponding
allowed only for noncommercial distribution and only if you Source.
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for The Corresponding Source for a work in source code form is that
making modifications to it. For an executable work, complete source same work.
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.
If distribution of executable or object code is made by offering 2. Basic Permissions.
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.
4. You may not copy, modify, sublicense, or distribute the Program All rights granted under this License are granted for the term of
except as expressly provided under this License. Any attempt copyright on the Program, and are irrevocable provided the stated
otherwise to copy, modify, sublicense or distribute the Program is conditions are met. This License explicitly affirms your unlimited
void, and will automatically terminate your rights under this License. permission to run the unmodified Program. The output from running a
However, parties who have received copies, or rights, from you under covered work is covered by this License only if the output, given its
this License will not have their licenses terminated so long as such content, constitutes a covered work. This License acknowledges your
parties remain in full compliance. 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 You may make, run and propagate covered works that you do not
signed it. However, nothing else grants you permission to modify or convey, without conditions so long as your license otherwise remains
distribute the Program or its derivative works. These actions are in force. You may convey covered works to others for the sole purpose
prohibited by law if you do not accept this License. Therefore, by of having them make modifications exclusively for you, or provide you
modifying or distributing the Program (or any work based on the with facilities for running those works, provided that you comply with
Program), you indicate your acceptance of this License to do so, and the terms of this License in conveying all material for which you do
all its terms and conditions for copying, distributing or modifying not control copyright. Those thus making or running the covered works
the Program or works based on it. 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 Conveying under any other circumstances is permitted solely under
Program), the recipient automatically receives a license from the the conditions stated below. Sublicensing is not allowed; section 10
original licensor to copy, distribute or modify the Program subject to makes it unnecessary.
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein. 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
You are not responsible for enforcing compliance by third parties to
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. this License.
7. If, as a consequence of a court judgment or allegation of patent Each contributor grants you a non-exclusive, worldwide, royalty-free
infringement or for any other reason (not limited to patent issues), patent license under the contributor's essential patent claims, to
conditions are imposed on you (whether by court order, agreement or 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 otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot excuse you from the conditions of this License. If you cannot convey a
distribute so as to satisfy simultaneously your obligations under this covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you License and any other pertinent obligations, then as a consequence you may
may not distribute the Program at all. For example, if a patent not convey it at all. For example, if you agree to terms that obligate you
license would not permit royalty-free redistribution of the Program by to collect a royalty for further conveying from those to whom you convey
all those who receive copies directly or indirectly through you, then the Program, the only way you could satisfy both those terms and this
the only way you could satisfy both it and this License would be to License would be to refrain entirely from conveying the Program.
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under 13. Use with the GNU Affero General Public License.
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.
It is not the purpose of this section to induce you to infringe any Notwithstanding any other provision of this License, you have
patents or other property right claims or to contest validity of any permission to link or combine any covered work with a work licensed
such claims; this section has the sole purpose of protecting the under version 3 of the GNU Affero General Public License into a single
integrity of the free software distribution system, which is combined work, and to convey the resulting work. The terms of this
implemented by public license practices. Many people have made License will continue to apply to the part which is the covered work,
generous contributions to the wide range of software distributed but the special requirements of the GNU Affero General Public License,
through that system in reliance on consistent application of that section 13, concerning interaction through a network will apply to the
system; it is up to the author/donor to decide if he or she is willing combination as such.
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to 14. Revised Versions of this License.
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in The Free Software Foundation may publish revised and/or new versions of
certain countries either by patents or by copyrighted interfaces, the the GNU General Public License from time to time. Such new versions will
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
be similar in spirit to the present version, but may differ in detail to be similar in spirit to the present version, but may differ in detail to
address new problems or concerns. address new problems or concerns.
Each version is given a distinguishing version number. If the Program Each version is given a distinguishing version number. If the
specifies a version number of this License which applies to it and "any Program specifies that a certain numbered version of the GNU General
later version", you have the option of following the terms and conditions Public License "or any later version" applies to it, you have the
either of that version or of any later version published by the Free option of following the terms and conditions either of that numbered
Software Foundation. If the Program does not specify a version number of version or of any later version published by the Free Software
this License, you may choose any version ever published by the Free Software Foundation. If the Program does not specify a version number of the
Foundation. 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 If the Program specifies that a proxy can decide which future
programs whose distribution conditions are different, write to the author versions of the GNU General Public License can be used, that proxy's
to ask for permission. For software which is copyrighted by the Free public statement of acceptance of a version permanently authorizes you
Software Foundation, write to the Free Software Foundation; we sometimes to choose that version for the Program.
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.
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 15. Disclaimer of 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.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS 16. Limitation of Liability.
How to Apply These Terms to Your New Programs IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it possible use to the public, the best way to achieve this is to make it
@ -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 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 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. 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.> <one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author> 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 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. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
@ -304,38 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program. If not, see <http://www.gnu.org/licenses/>.
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail. 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 If the program does terminal interaction, make it output a short
when it starts in an interactive mode: notice like this when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author <program> Copyright (C) <year> <name of author>
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate 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 parts of the General Public License. Of course, your program's commands
be called something other than `show w' and `show c'; they could even be might be different; for a GUI interface, you would use an "about box".
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your You should also get your employer (if you work as a programmer) or school,
school, if any, to sign a "copyright disclaimer" for the program, if if any, to sign a "copyright disclaimer" for the program, if necessary.
necessary. Here is a sample; alter the names: 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 Library 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>.

21
application/classes/auth/orm.php
View File

@ -3,7 +3,7 @@
/** /**
* This class overrides Kohana's Auth so that we can login to TSM * This class overrides Kohana's Auth so that we can login to TSM
* *
* @package PTA * @package PTA/Modifications
* @subpackage Auth * @subpackage Auth
* @category Overrides * @category Overrides
* @author Deon George * @author Deon George
@ -11,19 +11,16 @@
* @license http://phptsmadmin.sf.net/license.html * @license http://phptsmadmin.sf.net/license.html
*/ */
class Auth_ORM extends Kohana_Auth_ORM { class Auth_ORM extends Kohana_Auth_ORM {
/** // Override Kohana Auth requirement to have a hash_key
* Attempt to log in a user by using an ORM object and plain-text password. public function hash($str) {
* switch ($this->_config['hash_method']) {
* @param string username to log in case '' : return $str;
* @param string password to check against case 'md5': return md5($str);
* @param boolean enable autologin default: return hash_hmac($this->_config['hash_method'], $str, $this->_config['hash_key']);
* @return boolean }
*/
public function login($username, $password, $remember = FALSE) {
// With TSM, if we get this far, we are logged in
return $username->loaded();
} }
// Override Kohana logged_in() - if we can get the user, we are logged in.
public function logged_in($role = NULL, $all_required = TRUE) { public function logged_in($role = NULL, $all_required = TRUE) {
return FALSE !== $this->get_user(); return FALSE !== $this->get_user();
} }

37
application/classes/auth/tsm.php Normal file
View File

@ -0,0 +1,37 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* OSB Auth driver.
*
* @package PTA
* @subpackage Account
* @category Auth
* @author Deon George
* @copyright (c) phpTSMadmin Development Team
* @license http://phptsmadmin.sf.net/license.html
*/
class Auth_TSM extends Auth_ORM {
/**
* Logs a user in.
*
* @param string username
* @param string password
* @param boolean enable autologin
* @return boolean
*/
protected function _login($user, $password, $remember) {
if ( ! is_object($user))
{
$username = $user;
// Load the user
$user = ORM::factory('admin')
->where('ADMIN_NAME','=',$username)
->find();
}
// Normally, if we get this far, we are already logged in.
return TRUE;
}
}
?>

20
application/classes/controller/lnapp/default.php
View File

@ -11,6 +11,14 @@
* @license http://dev.leenooks.net/license.html * @license http://dev.leenooks.net/license.html
*/ */
abstract class Controller_lnApp_Default extends Controller { abstract class Controller_lnApp_Default extends Controller {
/**
* The variable that our output is stored in
*/
protected $output = NULL;
/**
* @var string page media route as per [Route]
*/
protected $mediaroute = 'default/media';
/** /**
* Controls access to this controller. * Controls access to this controller.
* Can be set to a string or an array, for example 'login' or array('login', 'admin') * Can be set to a string or an array, for example 'login' or array('login', 'admin')
@ -48,8 +56,8 @@ abstract class Controller_lnApp_Default extends Controller {
return FALSE; return FALSE;
return (($this->auth_required !== FALSE && Auth::instance()->logged_in() === FALSE) || return (($this->auth_required !== FALSE && Auth::instance()->logged_in() === FALSE) ||
(is_array($this->secure_actions) && array_key_exists($this->request->action,$this->secure_actions) && (is_array($this->secure_actions) && array_key_exists($this->request->action(),$this->secure_actions) &&
Auth::instance()->logged_in($this->secure_actions[$this->request->action]) === FALSE)); Auth::instance()->logged_in($this->secure_actions[$this->request->action()]) === FALSE));
} }
public function before() { public function before() {
@ -58,16 +66,16 @@ abstract class Controller_lnApp_Default extends Controller {
// Check user auth and role // Check user auth and role
if ($this->_auth_required()) { if ($this->_auth_required()) {
// For AJAX/JSON requests, authorisation is controlled in the method. // For AJAX/JSON requests, authorisation is controlled in the method.
if (Request::$is_ajax && $this->request->action === 'json') { if (Request::current()->is_ajax() && $this->request->action() === 'json') {
// Nothing required. // Nothing required.
// For no AJAX/JSON requests, display an access page // For no AJAX/JSON requests, display an access page
} elseif (Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__)) { } elseif (Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__)) {
Request::instance()->redirect('login/noaccess'); Request::current()->redirect('login/noaccess');
} else { } else {
Session::instance()->set('afterlogin',Request::instance()->uri()); Session::instance()->set('afterlogin',Request::detect_uri());
Request::instance()->redirect($this->noauth_redirect); Request::current()->redirect($this->noauth_redirect);
} }
} }
} }

42
application/classes/controller/lnapp/login.php
View File

@ -12,34 +12,30 @@
* @also [logout] * @also [logout]
*/ */
class Controller_lnApp_Login extends Controller_TemplateDefault { class Controller_lnApp_Login extends Controller_TemplateDefault {
protected $auth_required = FALSE;
public function action_index() { public function action_index() {
// If user already signed-in // If user already signed-in
if (Auth::instance()->logged_in()!= 0) { if (Auth::instance()->logged_in()!= 0) {
// Redirect to the user account // Redirect to the user account
Request::instance()->redirect('welcome/index'); Request::current()->redirect('welcome/index');
} }
// If there is a post and $_POST is not empty // If there is a post and $_POST is not empty
if ($_POST) { if ($_POST) {
// Store our details in a session key // Store our details in a session key
Session::instance()->set('username',$_POST['username']); Session::instance()->set(Kohana::config('auth.session_key'),$_POST['username']);
Session::instance()->set('password',$_POST['password']); Session::instance()->set('password',$_POST['password']);
// Instantiate a new user
$user = ORM::factory('account');
// Check Auth
$status = $user->login($_POST);
// If the post data validates using the rules setup in the user model // If the post data validates using the rules setup in the user model
if ($status) { if (Auth::instance()->login($_POST['username'],$_POST['password'])) {
// Redirect to the user account // Redirect to the user account
if ($redir = Session::instance()->get('afterlogin')) { if ($redir = Session::instance()->get('afterlogin')) {
Session::instance()->delete('afterlogin'); Session::instance()->delete('afterlogin');
Request::instance()->redirect($redir); Request::current()->redirect($redir);
} else } else
Request::instance()->redirect('welcome/index'); Request::current()->redirect('welcome/index');
} else { } else {
SystemMessage::add(array( SystemMessage::add(array(
@ -56,9 +52,6 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
'style'=>array('css/login.css'=>'screen'), 'style'=>array('css/login.css'=>'screen'),
)); ));
$this->template->control = HTML::anchor($this->request->uri(),'Login',array('id'=>'ajxbody'));
$this->template->content = Block::factory();
Script::add(array('type'=>'stdin','data'=>' Script::add(array('type'=>'stdin','data'=>'
$(document).ready(function() { $(document).ready(function() {
$("#ajxbody").click(function() {$("#ajBODY").load("'.$this->request->uri().'/"); return false;}); $("#ajxbody").click(function() {$("#ajBODY").load("'.$this->request->uri().'/"); return false;});
@ -70,7 +63,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
// If user already signed-in // If user already signed-in
if (Auth::instance()->logged_in()!= 0) { if (Auth::instance()->logged_in()!= 0) {
// Redirect to the user account // Redirect to the user account
Request::instance()->redirect('welcome/index'); Request::current()->redirect('welcome/index');
} }
// Instantiate a new user // Instantiate a new user
@ -82,7 +75,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
$status = $account->values($_POST)->check(); $status = $account->values($_POST)->check();
if (! $status) { if (! $status) {
foreach ($account->validate()->errors() as $f=>$r) { foreach ($account->validation()->errors('form/register') as $f => $r) {
// $r[0] has our reason for validation failure // $r[0] has our reason for validation failure
switch ($r[0]) { switch ($r[0]) {
// Generic validation reason // Generic validation reason
@ -90,7 +83,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
SystemMessage::add(array( SystemMessage::add(array(
'title'=>_('Validation failed'), 'title'=>_('Validation failed'),
'type'=>'error', 'type'=>'error',
'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r[0]) 'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r)
)); ));
} }
} }
@ -116,12 +109,9 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
'title'=>_('Register'), 'title'=>_('Register'),
'body'=>View::factory('bregister') 'body'=>View::factory('bregister')
->set('account',$account) ->set('account',$account)
->set('errors',$account->validate()->errors()), ->set('errors',$account->validation()->errors('form/register')),
'style'=>array('css/bregister.css'=>'screen'),
)); ));
$this->template->control = HTML::anchor($this->request->uri(),'Register',array('id'=>'ajxbody'));
$this->template->content = Block::factory();
$this->template->left = HTML::anchor('login','Login').'...'; $this->template->left = HTML::anchor('login','Login').'...';
} }
@ -132,7 +122,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
// If user already signed-in // If user already signed-in
if (Auth::instance()->logged_in()!= 0) { if (Auth::instance()->logged_in()!= 0) {
// Redirect to the user account // Redirect to the user account
Request::instance()->redirect('welcome/index'); Request::current()->redirect('welcome/index');
} }
// If the user posted their details to reset their password // If the user posted their details to reset their password
@ -176,7 +166,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
// Redirect to our password reset, the Auth will validate the token. // Redirect to our password reset, the Auth will validate the token.
} elseif (! empty($_REQUEST['token'])) { } elseif (! empty($_REQUEST['token'])) {
Request::instance()->redirect(sprintf('user/account/resetpassword?token=%s',$_REQUEST['token'])); Request::current()->redirect(sprintf('user/account/resetpassword?token=%s',$_REQUEST['token']));
} }
// Show our token screen even if the email was invalid. // Show our token screen even if the email was invalid.
@ -187,7 +177,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
'style'=>array('css/login.css'=>'screen'), 'style'=>array('css/login.css'=>'screen'),
)); ));
else else
Request::instance()->redirect('login'); Request::current()->redirect('login');
} else { } else {
Block::add(array( Block::add(array(
@ -196,13 +186,9 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
'style'=>array('css/login.css'=>'screen'), 'style'=>array('css/login.css'=>'screen'),
)); ));
} }
$this->template->content = Block::factory();
} }
public function action_noaccess() { public function action_noaccess() {
$this->template->content = '&nbsp;';
SystemMessage::add(array( SystemMessage::add(array(
'title'=>_('No access to requested resource'), 'title'=>_('No access to requested resource'),
'type'=>'error', 'type'=>'error',

4
application/classes/controller/lnapp/logout.php
View File

@ -17,10 +17,10 @@ class Controller_lnApp_Logout extends Controller {
if (Auth::instance()->logged_in()!= 0) { if (Auth::instance()->logged_in()!= 0) {
Auth::instance()->logout(); Auth::instance()->logout();
Request::instance()->redirect('login'); Request::current()->redirect('login');
} }
Request::instance()->redirect('welcome/index'); Request::current()->redirect('welcome/index');
} }
} }
?> ?>

53
application/classes/controller/lnapp/templatedefault.php
View File

@ -15,10 +15,6 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
* @var string page template * @var string page template
*/ */
public $template = 'lnapp/default'; public $template = 'lnapp/default';
/**
* @var string page media route as per [Route]
*/
protected $mediaroute = 'default/media';
/** /**
* @var object meta object information as per [meta] * @var object meta object information as per [meta]
*/ */
@ -62,8 +58,8 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
return FALSE; return FALSE;
return (($this->auth_required !== FALSE && Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__) === FALSE) || return (($this->auth_required !== FALSE && Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__) === FALSE) ||
(is_array($this->secure_actions) && array_key_exists($this->request->action,$this->secure_actions) && (is_array($this->secure_actions) && array_key_exists($this->request->action(),$this->secure_actions) &&
Auth::instance()->logged_in($this->secure_actions[$this->request->action],get_class($this).'|'.__METHOD__) === FALSE)); Auth::instance()->logged_in($this->secure_actions[$this->request->action()],get_class($this).'|'.__METHOD__) === FALSE));
} }
/** /**
@ -74,7 +70,7 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
*/ */
public function before() { public function before() {
// Do not template media files // Do not template media files
if ($this->request->action === 'media') { if ($this->request->action() === 'media') {
$this->auto_render = FALSE; $this->auto_render = FALSE;
return; return;
} }
@ -84,7 +80,7 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
// Check user auth and role // Check user auth and role
if ($this->_auth_required()) { if ($this->_auth_required()) {
if (Kohana::$is_cli) if (Kohana::$is_cli)
throw new Kohana_Exception('Cant run :method, authentication not possible',array(':method'=>$this->request->action)); throw new Kohana_Exception('Cant run :method, authentication not possible',array(':method'=>$this->request->action()));
// If auth is required and the user is logged in, then they dont have access. // If auth is required and the user is logged in, then they dont have access.
// (We have already checked authorisation.) // (We have already checked authorisation.)
@ -93,24 +89,24 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
SystemMessage::add(array( SystemMessage::add(array(
'title'=>_('Insufficient Access'), 'title'=>_('Insufficient Access'),
'type'=>'debug', 'type'=>'debug',
'body'=>Kohana::debug(array('required'=>$this->auth_required,'action'=>$this->request->action,'user'=>Auth::instance()->get_user()->username)), 'body'=>Kohana::debug(array('required'=>$this->auth_required,'action'=>$this->request->action(),'user'=>Auth::instance()->get_user()->username)),
)); ));
// @todo Login No Access redirects are not handled in JS? // @todo Login No Access redirects are not handled in JS?
if (Request::$is_ajax) { if ($this->request->is_ajax()) {
echo _('You dont have enough permissions.'); echo _('You dont have enough permissions.');
die(); die();
} else } else
Request::instance()->redirect('login/noaccess'); Request::current()->redirect('login/noaccess');
} else { } else {
Session::instance()->set('afterlogin',Request::instance()->uri()); Session::instance()->set('afterlogin',Request::detect_uri());
Request::instance()->redirect($this->noauth_redirect); Request::current()->redirect($this->noauth_redirect);
} }
} }
// For AJAX calls, we dont need to render the complete page. // For AJAX calls, we dont need to render the complete page.
if (Request::$is_ajax) { if ($this->request->is_ajax()) {
$this->auto_render = FALSE; $this->auto_render = FALSE;
return; return;
} }
@ -148,6 +144,9 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
} }
public function after() { public function after() {
if (! is_string($this->template) AND empty($this->template->content))
$this->template->content = Block::factory();
if ($this->auto_render) { if ($this->auto_render) {
// Application Title // Application Title
$this->meta->title = 'Application Title'; $this->meta->title = 'Application Title';
@ -181,18 +180,16 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
$this->template->footer = $this->_footer(); $this->template->footer = $this->_footer();
// For any ajax rendered actions, we'll need to capture the content and put it in the response // For any ajax rendered actions, we'll need to capture the content and put it in the response
} elseif (Request::$is_ajax && isset($this->template->content) && ! $this->request->response) { } elseif ($this->request->is_ajax() && isset($this->template->content) && ! $this->response->body()) {
// @todo move this formatting to a view? // @todo move this formatting to a view?
if ($s = $this->_sysmsg() AND (string)$s) { if ($s = $this->_sysmsg() AND (string)$s)
$this->request->response = sprintf('<table class="sysmsg"><tr><td>%s</td></tr></table>',$s); $this->response->body(sprintf('<table class="sysmsg"><tr><td>%s</td></tr></table>',$s));
} else
$this->request->response = '';
# In case there any style sheets or scrpits for this render. # In case there any style sheets or scrpits for this render.
$this->request->response .= Style::factory(); $this->response->bodyadd(Style::factory());
# Get the response body # Get the response body
$this->request->response .= sprintf('<table class="content"><tr><td>%s</td></tr></table>',$this->template->content); $this->response->bodyadd(sprintf('<table class="content"><tr><td>%s</td></tr></table>',$this->template->content));
} }
parent::after(); parent::after();
@ -244,7 +241,7 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
*/ */
final public function action_media() { final public function action_media() {
// Generate and check the ETag for this file // Generate and check the ETag for this file
$this->request->check_cache(sha1($this->request->uri)); $this->response->check_cache(NULL,$this->request);
// Get the file path from the request // Get the file path from the request
$file = $this->request->param('file'); $file = $this->request->param('file');
@ -258,22 +255,22 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
// First try and find media files for the site_id // First try and find media files for the site_id
if ($f = Kohana::find_file(sprintf('media/%s',Config::siteid()), $file, $ext)) { if ($f = Kohana::find_file(sprintf('media/%s',Config::siteid()), $file, $ext)) {
// Send the file content as the response // Send the file content as the response
$this->request->response = file_get_contents($f); $this->response->body(file_get_contents($f));
// If not found try a default media file // If not found try a default media file
} elseif ($f = Kohana::find_file('media', $file, $ext)) { } elseif ($f = Kohana::find_file('media', $file, $ext)) {
// Send the file content as the response // Send the file content as the response
$this->request->response = file_get_contents($f); $this->response->body(file_get_contents($f));
} else { } else {
// Return a 404 status // Return a 404 status
$this->request->status = 404; $this->response->status(404);
} }
// Set the proper headers to allow caching // Set the proper headers to allow caching
$this->request->headers['Content-Type'] = File::mime_by_ext($ext); $this->response->headers('Content-Type',File::mime_by_ext($ext));
$this->request->headers['Content-Length'] = filesize($f); $this->response->headers('Content-Length',(string)filesize($f));
$this->request->headers['Last-Modified'] = date('r', filemtime($f)); $this->response->headers('Last-Modified',date('r', filemtime($f)));
} }
} }
?> ?>

30
application/classes/controller/lnapp/tree.php
View File

@ -11,22 +11,20 @@
* @license http://dev.osbill.net/license.html * @license http://dev.osbill.net/license.html
*/ */
class Controller_lnApp_Tree extends Controller_Default { class Controller_lnApp_Tree extends Controller_Default {
// Our tree data
protected $treedata;
/** /**
* @var string page media route as per [Route] * @var string page media route as per [Route]
*/ */
protected static $mediaroute = 'default/media'; protected static $jsmediaroute = 'default/media';
public function after() { public function after() {
parent::after(); parent::after();
$this->request->headers['Content-Type'] = 'application/json'; $this->response->headers('Content-Type','application/json');
$this->request->response = sprintf('[%s]',json_encode($this->treedata)); $this->response->body(sprintf('[%s]',json_encode($this->output)));
} }
public static function js() { public static function js() {
$mediapath = Route::get(static::$mediaroute); $mediapath = Route::get(static::$jsmediaroute);
return ' return '
<div id="tree" class=""></div> <div id="tree" class=""></div>
@ -85,28 +83,18 @@ $(function () {
* *
* @param id * @param id
*/ */
public function action_json($id=null) { public function action_json($id=null,array $data=array()) {
if (! Auth::instance()->logged_in()) { if ($this->_auth_required() AND ! Auth::instance()->logged_in()) {
$this->treedata = array('attr'=>array('id'=>'a_login'), $this->output = array('attr'=>array('id'=>'a_login'),
'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login')))); 'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login'))));
return; return;
} }
$this->treedata = array(); $this->output = array();
$data = array();
// @todo Our menu options
array_push($data,array(
'id'=>'node',
'name'=>'Node Info',
'state'=>'none',
'attr_id'=>'1',
'attr_href'=>URL::Site('/node'),
));
foreach ($data as $branch) { foreach ($data as $branch) {
array_push($this->treedata,array( array_push($this->output,array(
'attr'=>array('id'=>sprintf('B_%s',$branch['id'])), 'attr'=>array('id'=>sprintf('B_%s',$branch['id'])),
'state'=>$branch['state'], 'state'=>$branch['state'],
'data'=>array('title'=>$branch['name']), 'data'=>array('title'=>$branch['name']),

14
application/classes/controller/templatedefault.php
View File

@ -1,4 +1,16 @@
<?php defined('SYSPATH') or die('No direct access allowed.'); <?php defined('SYSPATH') or die('No direct access allowed.');
class Controller_TemplateDefault extends Controller_lnApp_TemplateDefault {} /**
* This class provides the default template controller for rendering pages.
*
* @package PTA
* @subpackage Page/Template
* @category Controllers
* @author Deon George
* @copyright (c) 2010 phpTSMadmin Development Team
* @license http://phptsmadmin.sf.net/license.html
*/
class Controller_TemplateDefault extends Controller_lnApp_TemplateDefault {
protected $auth_required = TRUE;
}
?> ?>

35
application/classes/controller/tree.php
View File

@ -1,4 +1,37 @@
<?php defined('SYSPATH') or die('No direct access allowed.'); <?php defined('SYSPATH') or die('No direct access allowed.');
class Controller_Tree extends Controller_lnApp_Tree {} /**
* This class extends renders OSB menu tree.
*
* @package lnApp
* @subpackage Tree
* @category Controllers
* @author Deon George
* @copyright (c) 2010 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Controller_Tree extends Controller_lnApp_Tree {
protected $auth_required = TRUE;
/**
* Draw the Tree Menu
*
* The incoming ID is either a Branch B_x or a Node N_x
* Where X is actually the module.
*
* @param id
*/
public function action_json($id=null,array $data=array()) {
// @todo Our menu options
array_push($data,array(
'id'=>'node',
'name'=>'Node Info',
'state'=>'none',
'attr_id'=>'1',
'attr_href'=>URL::Site('/node'),
));
return parent::action_json($id,$data);
}
}
?> ?>

19
application/classes/controller/welcome.php
View File

@ -1,16 +1,21 @@
<?php defined('SYSPATH') or die('No direct access allowed.'); <?php defined('SYSPATH') or die('No direct access allowed.');
/**
* phpTSMadmin Main home page
*
* @package PTA
* @subpackage Page/Home
* @category Controllers
* @author Deon George
* @copyright (c) 2010 phpTSMadmin Development Team
* @license http://phptsmadmin.sf.net/license.html
*/
class Controller_Welcome extends Controller_TemplateDefault { class Controller_Welcome extends Controller_TemplateDefault {
public function action_index() {
public function action_index()
{
Block::add(array( Block::add(array(
'title'=>sprintf('%s: %s (%s)',_('Server'),TSM::name(),TSM::version()), 'title'=>sprintf('%s: %s (%s)',_('Server'),TSM::name(),TSM::version()),
'body'=>'hello, world!', 'body'=>'hello, world!',
)); ));
$this->template->content = Block::factory();
} }
}
} // End Welcome
?> ?>

144
application/classes/database/tsm.php
View File

@ -11,7 +11,6 @@
* @license http://phptsmadmin.sf.net/license.html * @license http://phptsmadmin.sf.net/license.html
*/ */
class Database_TSM extends Database { class Database_TSM extends Database {
// Database in use by each connection // Database in use by each connection
protected static $_current_databases = array(); protected static $_current_databases = array();
@ -39,8 +38,13 @@ class Database_TSM extends Database {
'ANR2034E', // SELECT: No match found using this criteria. 'ANR2034E', // SELECT: No match found using this criteria.
); );
public function connect() // Our required abstract methods
{ public function begin($mode = NULL) {}
public function commit() {}
public function rollback() {}
public function set_charset($charset) {}
public function connect() {
if ($this->_connection) if ($this->_connection)
return; return;
@ -55,7 +59,7 @@ class Database_TSM extends Database {
// Get user login details from user session - these are set by login // Get user login details from user session - these are set by login
if (! $username) if (! $username)
$username = Session::instance()->get_once('username'); $username = Session::instance()->get_once(Kohana::config('auth.session_key'));
if (! $password) if (! $password)
$password = Session::instance()->get_once('password'); $password = Session::instance()->get_once('password');
@ -71,25 +75,22 @@ class Database_TSM extends Database {
} }
if (! $username OR ! $password) if (! $username OR ! $password)
Request::instance()->redirect('/login?need_login=1'); Request::current()->redirect('/login?need_login=1');
try try {
{ if ($persistent) {
if ($persistent)
{
// Create a persistent connection // Create a persistent connection
throw new Kohana_Exception('Cant do persistant connections'); throw new Kohana_Exception('Cant do persistant connections');
}
else } else {
{
// Create a connection and force it to be a new link // Create a connection and force it to be a new link
$this->_connection = sprintf('%s %s -id=%s -password=%s -displ=list -dataonly=YES %s %s', $this->_connection = sprintf('%s %s -id=%s -password=%s -displ=list -editor=no -dataonly=YES %s %s ',
Kohana::config('config.client'), Kohana::config('config.client'),
Kohana::config('config.stanza') ? '-server='.Kohana::config('config.stanza') : '', $database ? '-server='.$database : '',
$username, $username,
$password, $password,
Kohana::config('config.client_errorlogname') ? sprintf('-errorlogname=%s',Kohana::config('config.client_errorlogname')) : '', Kohana::config('config.client_errorlogname') ? sprintf('-errorlogname=%s',Kohana::config('config.client_errorlogname')) : '',
Kohana::config('config.client_stanza') ? sprintf('-se=%s',Kohana::config('config.client_stanza')) : '' $database ? sprintf('-se=%s',$database) : ''
); );
$result = $this->query(Database::SELECT,'SELECT server_name,platform,version,release,level,sublevel FROM status'); $result = $this->query(Database::SELECT,'SELECT server_name,platform,version,release,level,sublevel FROM status');
@ -97,11 +98,10 @@ class Database_TSM extends Database {
if ($result) if ($result)
return TSM::instance()->set($username,$password,$result); return TSM::instance()->set($username,$password,$result);
else else
Request::instance()->redirect(Request::instance()->uri()); Request::current()->redirect(Request::detect_uri());
} }
}
catch (ErrorException $e) } catch (ErrorException $e) {
{
// No connection exists // No connection exists
$this->_connection = NULL; $this->_connection = NULL;
@ -114,69 +114,24 @@ class Database_TSM extends Database {
// \xFF is a better delimiter, but the PHP driver uses underscore // \xFF is a better delimiter, but the PHP driver uses underscore
$this->_connection_id = sha1($hostname.'_'.$username.'_'.$password); $this->_connection_id = sha1($hostname.'_'.$username.'_'.$password);
if ( ! empty($this->_config['charset'])) if ( ! empty($this->_config['charset'])) {
{
// Set the character set // Set the character set
$this->set_charset($this->_config['charset']); $this->set_charset($this->_config['charset']);
} }
} }
public function disconnect()
{
try
{
// Database is assumed disconnected
$status = TRUE;
if (is_resource($this->_connection))
{
if ($status = mysql_close($this->_connection))
{
// Clear the connection
$this->_connection = NULL;
}
}
}
catch (Exception $e)
{
// Database is probably not disconnected
$status = ! is_resource($this->_connection);
}
return $status;
}
public function set_charset($charset)
{
// Make sure the database is connected
$this->_connection or $this->connect();
// Nothing to do for TSM
$status = TRUE;
if ($status === FALSE)
{
throw new Database_Exception(':error',
array(':error' => mysql_error($this->_connection)),
mysql_errno($this->_connection));
}
}
private function clear() { private function clear() {
$this->_query_msg_codes = array(); $this->_query_msg_codes = array();
} }
public function query($type, $sql, $as_object = FALSE, array $params = NULL) public function query($type, $sql, $as_object = FALSE, array $params = NULL) {
{
// Make sure the database is connected // Make sure the database is connected
$this->_connection or $this->connect(); $this->_connection or $this->connect();
$this->clear(); $this->clear();
if ( ! empty($this->_config['profiling'])) if ( ! empty($this->_config['profiling']))
{
// Benchmark this query for the current instance // Benchmark this query for the current instance
$benchmark = Profiler::start("Database ({$this->_instance})", $sql); $benchmark = Profiler::start("Database ({$this->_instance})", $sql);
}
// We need to escape any back slashes, since the exec will transpose them // We need to escape any back slashes, since the exec will transpose them
// @todo Is there a better way of doing this? // @todo Is there a better way of doing this?
@ -211,98 +166,75 @@ class Database_TSM extends Database {
} }
if (isset($benchmark)) if (isset($benchmark))
{
Profiler::stop($benchmark); Profiler::stop($benchmark);
}
// Set the last query // Set the last query
$this->last_query = $sql; $this->last_query = $sql;
if ($type === Database::SELECT) if ($type === Database::SELECT)
{
// Return an iterator of results // Return an iterator of results
return new Database_TSM_Result($result, $sql, $as_object, $params); return new Database_TSM_Result($result, $sql, $as_object, $params);
}
elseif ($type === Database::INSERT) elseif ($type === Database::INSERT)
{
throw new Kohana_Exception('Database INSERTS are not supported'); throw new Kohana_Exception('Database INSERTS are not supported');
}
} }
public function list_tables($like = NULL) public function list_tables($like = NULL) {
{
if (is_string($like)) if (is_string($like))
{
// Search for table names // Search for table names
$result = $this->query(Database::SELECT, 'SHOW TABLES LIKE '.$this->quote($like), FALSE); $result = $this->query(Database::SELECT, 'SHOW TABLES LIKE '.$this->quote($like), FALSE);
}
else else
{
// Find all table names // Find all table names
$result = $this->query(Database::SELECT, 'SHOW TABLES', FALSE); $result = $this->query(Database::SELECT, 'SHOW TABLES', FALSE);
}
$tables = array(); $tables = array();
foreach ($result as $row) foreach ($result as $row)
{
$tables[] = reset($row); $tables[] = reset($row);
}
return $tables; return $tables;
} }
public function list_columns($table, $like = NULL, $add_prefix = TRUE) public function list_columns($table, $like = NULL, $add_prefix = TRUE) {
{
// Quote the table name // Quote the table name
$table = ($add_prefix === TRUE) ? $this->quote_table($table) : $table; $table = ($add_prefix === TRUE) ? $this->quote_table($table) : $table;
if (is_string($like)) if (is_string($like))
{
// Search for column names // Search for column names
$result = $this->query(Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table.' LIKE '.$this->quote($like), FALSE); $result = $this->query(Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table.' LIKE '.$this->quote($like), FALSE);
}
else else
{
// Find all column names // Find all column names
$result = $this->query(Database::SELECT, sprintf('SELECT * FROM SYSCAT.COLUMNS WHERE TABNAME=\'%s\'',$table), FALSE); $result = $this->query(Database::SELECT, sprintf('SELECT * FROM SYSCAT.COLUMNS WHERE TABNAME=\'%s\'',$table), FALSE);
}
$count = 0; $count = 0;
$columns = array(); $columns = array();
foreach ($result as $row) foreach ($result as $row) {
{
list($type, $length) = $this->_parse_type($row['TYPENAME']); list($type, $length) = $this->_parse_type($row['TYPENAME']);
$column = $this->datatype($type); $column = $this->datatype($type);
$column['column_name'] = $row['COLNAME']; $column['column_name'] = $row['COLNAME'];
// $column['column_default'] = $row['Default'];
$column['data_type'] = $type; $column['data_type'] = $type;
$column['is_nullable'] = ($row['NULLS'] == 'TRUE'); $column['is_nullable'] = ($row['NULLS'] == 'TRUE');
$column['ordinal_position'] = ++$count; $column['ordinal_position'] = ++$count;
switch (strtolower($column['data_type'])) switch (strtolower($column['data_type'])) {
{
case 'float': case 'float':
if (isset($length)) if (isset($length))
{
list($column['numeric_precision'], $column['numeric_scale']) = explode(',', $length); list($column['numeric_precision'], $column['numeric_scale']) = explode(',', $length);
} break;
break;
case 'int': case 'int':
if (isset($length)) if (isset($length))
{
// MySQL attribute // MySQL attribute
$column['display'] = $length; $column['display'] = $length;
} break;
break;
case 'string': case 'string':
switch ($column['data_type']) switch ($column['data_type']) {
{
case 'binary': case 'binary':
case 'varbinary': case 'varbinary':
$column['character_maximum_length'] = $length; $column['character_maximum_length'] = $length;
break; break;
case 'char': case 'char':
case 'varchar': case 'varchar':
$column['character_maximum_length'] = $length; $column['character_maximum_length'] = $length;
@ -311,27 +243,27 @@ class Database_TSM extends Database {
case 'mediumtext': case 'mediumtext':
case 'longtext': case 'longtext':
$column['collation_name'] = $row['Collation']; $column['collation_name'] = $row['Collation'];
break; break;
case 'enum': case 'enum':
case 'set': case 'set':
$column['collation_name'] = $row['Collation']; $column['collation_name'] = $row['Collation'];
$column['options'] = explode('\',\'', substr($length, 1, -1)); $column['options'] = explode('\',\'', substr($length, 1, -1));
break; break;
} }
break;
break;
} }
// TSM attributes // TSM attributes
$column['comment'] = $row['REMARKS']; $column['comment'] = $row['REMARKS'];
$columns[$row['COLNAME']] = $column; $columns[$row['COLNAME']] = $column;
} }
return $columns; return $columns;
} }
public function escape($value) public function escape($value) {
{
// Make sure the database is connected // Make sure the database is connected
$this->_connection or $this->connect(); $this->_connection or $this->connect();

2
application/classes/database/tsm/result.php
View File

@ -73,7 +73,7 @@ class Database_TSM_Result extends Database_Result {
// Return an object of given class name // Return an object of given class name
$o = new $this->_as_object; $o = new $this->_as_object;
return $o->values($this->_rows[$this->_current_row]); return $o->load_object($this->_rows[$this->_current_row]);
} }
else else
{ {

19
application/classes/form.php Normal file
View File

@ -0,0 +1,19 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* This class overrides Kohana's Form
*
* @package lnApp/Modifications
* @category Classes
* @category Helpers
* @author Deon George
* @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html
*/
class Form extends Kohana_Form {
// Enable 3.0 features, default to current URI for empty Form::open()
public static function open($action = NULL, array $attributes = NULL) {
return parent::open(is_null($action) ? Request::detect_uri() : $action,$attributes);
}
}
?>

30
application/classes/http/exception/404.php Normal file
View File

@ -0,0 +1,30 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* This class overrides Kohana's 404 Exception
*
* @package lnApp/Modifications
* @category Classes
* @category Helpers
* @author Deon George
* @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html
*/
class HTTP_Exception_404 extends Kohana_HTTP_Exception_404 {
public function __construct($message, array $variables = NULL, $code = 0)
{
set_exception_handler(array(get_class($this),'handler'));
parent::__construct($message, $variables, (int) $code);
}
public static function handler(Exception $e)
{
SystemMessage::add(array(
'title'=>_('Page not found'),
'type'=>'error',
'body'=>sprintf(_('The page [%s] you requested was not found?'),Request::detect_uri()),
));
Request::factory()->redirect('/welcome');
}
}

2
application/classes/lnapp/breadcrumb.php
View File

@ -49,7 +49,7 @@ class lnApp_Breadcrumb extends HTMLRender {
protected function render() { protected function render() {
$output = HTML::anchor('/',_('Home')); $output = HTML::anchor('/',_('Home'));
$data = empty(static::$_data['path']) ? explode('/',Request::instance()->uri) : static::$_data['path']; $data = empty(static::$_data['path']) ? explode('/',preg_replace('/^\//','',Request::detect_uri())) : static::$_data['path'];
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
$output .= static::$_spacer; $output .= static::$_spacer;

2
application/classes/lnapp/config.php
View File

@ -11,7 +11,7 @@
* @copyright (c) 2010 Deon George * @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html * @license http://dev.leenooks.net/license.html
*/ */
abstract class lnApp_Config extends Kohana { abstract class lnApp_Config extends Kohana_Config {
/** /**
* Return our site name * Return our site name
*/ */

2
application/classes/model/account.php → application/classes/model/admin.php
View File

@ -10,7 +10,7 @@
* @copyright (c) 2010 Deon George * @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html * @license http://dev.leenooks.net/license.html
*/ */
class Model_Account extends Model_Auth_UserDefault { class Model_ADMIN extends Model_Auth_UserDefault {
protected $_table_name = 'ADMINS'; protected $_table_name = 'ADMINS';
protected $_primary_key = 'ADMIN_NAME'; protected $_primary_key = 'ADMIN_NAME';
} }

38
application/classes/model/node.php
View File

@ -16,16 +16,34 @@ class Model_NODE extends ORMTSM {
'FILESPACE'=>array('foreign_key'=>'NODE_NAME','far_key'=>'FILESPACE_NAME'), 'FILESPACE'=>array('foreign_key'=>'NODE_NAME','far_key'=>'FILESPACE_NAME'),
); );
protected $_formats = array( protected $_display_filters = array(
'REG_TIME'=>array('ORMTSM::date'=>array('d-M-Y')), 'REG_TIME'=>array(
'PWSET_TIME'=>array('ORMTSM::date'=>array('d-M-Y')), array('ORMTSM::date',array(':value','d-M-Y')),
'LASTACC_TIME'=>array('ORMTSM::date'=>array('d-M-Y')), ),
'LASTSESS_SENT'=>array('number_format'=>array(0)), 'PWSET_TIME'=>array(
'LASTSESS_RECVD'=>array('number_format'=>array(0)), array('ORMTSM::date',array(':value','d-M-Y')),
'LASTSESS_DURATION'=>array('number_format'=>array(2)), ),
'LASTSESS_IDLEWAIT'=>array('number_format'=>array(2)), 'LASTACC_TIME'=>array(
'LASTSESS_COMMWAIT'=>array('number_format'=>array(2)), array('ORMTSM::date',array(':value','d-M-Y')),
'LASTSESS_MEDIAWAIT'=>array('number_format'=>array(2)), ),
'LASTSESS_SENT'=>array(
array('number_format',array(':value',0)),
),
'LASTSESS_RECVD'=>array(
array('number_format',array(':value',0)),
),
'LASTSESS_DURATION'=>array(
array('number_format',array(':value',2)),
),
'LASTSESS_IDLEWAIT'=>array(
array('number_format',array(':value',2)),
),
'LASTSESS_COMMWAIT'=>array(
array('number_format',array(':value',2)),
),
'LASTSESS_MEDIAWAIT'=>array(
array('number_format',array(':value',2)),
),
); );
protected $_sorting = array( protected $_sorting = array(

69
application/classes/orm.php Normal file
View File

@ -0,0 +1,69 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* This class overrides Kohana's ORM
*
* @package lnApp/Modifications
* @category Classes
* @category Helpers
* @author Deon George
* @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html
*/
class ORM extends Kohana_ORM {
protected $_table_names_plural = false;
private $_object_formated = array();
private $_formated = FALSE;
// Our filters used to display values in a friendly format
protected $_display_filters = array();
// Override check() so that it doesnt throw an exception.
// @todo Need to figure out how to show the items that fail validation
final public function check(Validation $extra_validation = NULL) {
// Determine if any external validation failed
$extra_errors = ($extra_validation AND ! $extra_validation->check());
// Always build a new validation object
$this->_validation();
$array = $this->_validation;
if (($this->_valid = $array->check()) === FALSE OR $extra_errors)
{
return FALSE;
}
return $this;
}
/**
* Format fields for display purposes
*
* @param string column name
* @return mixed
*/
private function _format() {
foreach ($this->_display_filters as $column => $formats)
$this->_object_formated[$column] = $this->run_filter($column,$this->__get($column),array($column=>$formats));
$this->_formated = TRUE;
}
/**
* Return a formated columns, as per the model definition
*/
public function display($column) {
// Trigger a load of the record.
$value = $this->__get($column);
// If some of our fields need to be formated for display purposes.
if ($this->_loaded AND ! $this->_formated AND $this->_display_filters)
$this->_format();
if (isset($this->_object_formated[$column]))
return $this->_object_formated[$column];
else
return $value;
}
}
?>

67
application/classes/ormtsm.php
View File

@ -3,14 +3,14 @@
/** /**
* This class extends Kohana's [ORM] class to create defaults for TSM. * This class extends Kohana's [ORM] class to create defaults for TSM.
* *
* @package TSM * @package PTA
* @subpackage Core * @subpackage Core
* @category ORM * @category ORM
* @author Deon George * @author Deon George
* @copyright (c) 2010 phpTSMadmin Development Team * @copyright (c) 2010 phpTSMadmin Development Team
* @license http://dev.osbill.net/license.html * @license http://dev.osbill.net/license.html
*/ */
abstract class ORMTSM extends ORM { class ORMTSM extends ORM {
// Suppress ORMs inclusion of <table_name>.* // Suppress ORMs inclusion of <table_name>.*
protected $_disable_wild_select = TRUE; protected $_disable_wild_select = TRUE;
// Suppress ORMs inclusion of <table_name>. to column joins // Suppress ORMs inclusion of <table_name>. to column joins
@ -23,70 +23,13 @@ abstract class ORMTSM extends ORM {
protected $_formated = FALSE; protected $_formated = FALSE;
protected $_formats = array(); protected $_formats = array();
/** // Load our values into the ORM object
* Format fields for display purposes public function load_object(array $values) {
* return parent::_load_values($values);
* @param string column name
* @return mixed
*/
protected function _format() {
$format = Validate::factory($this->_object);
foreach ($this->_formats as $column => $formats)
$format->filters($column,$formats);
if ($format->check())
foreach ($format as $column => $value)
$this->_object_formated[$column] = $value;
$this->_formated = TRUE;
}
/**
* Return a formated columns, as per the model definition
*/
public function display($column) {
// Trigger a load of the record.
$value = $this->__get($column);
// If some of our fields need to be formated for display purposes.
if ($value AND ! $this->_formated AND $this->_formats)
$this->_format();
if (isset($this->_object_formated[$column]))
return $this->_object_formated[$column];
else
return $value;
} }
public static function date($date,$format) { public static function date($date,$format) {
return date($format,strtotime($date)); return date($format,strtotime($date));
} }
/**
* This function will enhance the [Validate::filter], since it always passes
* the value as the first argument and sometimes functions need that to not
* be the first argument.
*
* Currently this implements:
* [date()][date-ref]
*
* [date-ref]: http://www.php.net/date
*
* This function will throw an exception if called without a function
* defined.
*
* @param mixed $val Value to be processed
* @param string $func Name of function to call
* @param string $arg Other arguments for the function
*/
final public static function _filters($val,$func,$arg) {
switch ($func) {
case 'date':
return date($arg,$val);
default:
throw new Exception(sprintf(_('Unknown function: %s (%s,%s)'),$func,$arg,$val));
}
}
} }
?> ?>

19
application/classes/response.php Normal file
View File

@ -0,0 +1,19 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* This class overrides Kohana's Response
*
* @package lnApp/Modifications
* @category Classes
* @category Helpers
* @author Deon George
* @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html
*/
class Response extends Kohana_Response {
// Append to the body.
public function bodyadd($content) {
$this->_body .= (string) $content;
}
}
?>

6
application/classes/tsm.php
View File

@ -7,13 +7,13 @@
* @subpackage Core * @subpackage Core
* @category Helpers * @category Helpers
* @author Deon George * @author Deon George
* @copyright (c) 2010 Deon George * @copyright (c) 2010 phpTSMadmin Development Team
* @license http://dev.leenooks.net/license.html * @license http://phptsmadmin.sf.net/license.html
*/ */
class TSM { class TSM {
public function set($username,$password,Database_TSM_Result $server) { public function set($username,$password,Database_TSM_Result $server) {
// @todo Consider encrypting this // @todo Consider encrypting this
Session::instance()->set('username',$username); Session::instance()->set(Kohana::config('auth.session_key'),$username);
Session::instance()->set('password',$password); Session::instance()->set('password',$password);
Session::instance()->set('SERVER',$server); Session::instance()->set('SERVER',$server);

27
application/classes/valid.php Normal file
View File

@ -0,0 +1,27 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* Array and variable validation.
*
* @package lnApp/Modifications
* @category Classes
* @author Deon George
* @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html
*/
class Valid extends Kohana_Valid {
/**
* Checks if a field matches the value of another field, if it is set.
* Field is ignored if it is blank.
*
* @param array array of values
* @param string field name
* @param string field name to match
* @return boolean
*/
public static function matches_ifset($array, $field, $match)
{
return isset($array[$match]) ? ($array[$field] === $array[$match]) : TRUE;
}
}
?>

7
application/config/auth.php
View File

@ -4,7 +4,6 @@
* PTA Configuration - Authentication Driver * PTA Configuration - Authentication Driver
* *
* @package PTA * @package PTA
* @subpackage TSM
* @category Configuration * @category Configuration
* @author Deon George * @author Deon George
* @copyright (c) 2010 phpTSMadmin Development Team * @copyright (c) 2010 phpTSMadmin Development Team
@ -12,11 +11,11 @@
*/ */
return array( return array(
'driver' => 'ORM', 'driver' => 'TSM',
'hash_method' => 'sha1', 'hash_method' => '',
'salt_pattern' => '1, 3, 5, 9, 14, 15, 20, 21, 28, 30', 'salt_pattern' => '1, 3, 5, 9, 14, 15, 20, 21, 28, 30',
'lifetime' => 1209600, 'lifetime' => 1209600,
'session_key' => 'username', 'session_key' => 'auth_user',
'forced_key' => 'auth_forced', 'forced_key' => 'auth_forced',
); );
?> ?>

23
application/config/cache.php Normal file
View File

@ -0,0 +1,23 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* PTA Configuration - Cache Driver
*
* @package PTA
* @subpackage Cache
* @category Configuration
* @author Deon George
* @copyright (c) 2010 phpTSMadmin Development Team
* @license http://phptsmadmin.sf.net/license.html
*/
return array
(
'file' => array
(
'driver' => 'file',
'cache_dir' => '/dev/shm/lnapp',
'default_expire' => 3600,
)
);
?>

1
application/config/config.php
View File

@ -13,7 +13,6 @@
return array( return array(
'cache_type' => 'file', 'cache_type' => 'file',
'client' => '/opt/tivoli/tsm/client/ba/bin/dsmadmc', 'client' => '/opt/tivoli/tsm/client/ba/bin/dsmadmc',
'stanza' => '',
'client_errorlogname' => '/tmp/pta-tsm-errorlog.log', 'client_errorlogname' => '/tmp/pta-tsm-errorlog.log',
'date_format' => 'd-m-Y', 'date_format' => 'd-m-Y',
'tsmpooltypes' => array('PRIMARY','ACTIVEDATA','COPY'), 'tsmpooltypes' => array('PRIMARY','ACTIVEDATA','COPY'),

6
application/config/database.php
View File

@ -28,11 +28,11 @@ return array
* *
* Ports and sockets may be appended to the hostname. * Ports and sockets may be appended to the hostname.
*/ */
'hostname' => 'localhost', //'hostname' => 'localhost', // Unused
'database' => 'kohana',
'username' => FALSE, 'username' => FALSE,
'password' => FALSE, 'password' => FALSE,
'persistent' => FALSE, //'persistent' => FALSE, // Unused
'database' => 'local',
), ),
'table_prefix' => '', 'table_prefix' => '',
'charset' => 'utf8', 'charset' => 'utf8',