From d997dac820885e4cbf83b676d165ca4aa6b5550a Mon Sep 17 00:00:00 2001 From: Brian Read Date: Thu, 26 Oct 2023 11:21:08 +0100 Subject: [PATCH] initial commit of file from CVS for e-smith-domains on Thu 26 Oct 11:21:08 BST 2023 --- .gitignore | 4 + Makefile | 21 + README.md | 18 +- additional/COPYING | 340 ++++++++++++ contriborbase | 1 + createlinks | 67 +++ e-smith-domains.spec | 274 ++++++++++ .../e-smith/db/domains/migrate/10sanitise-db | 24 + .../e-smith/db/domains/migrate/20nameservers | 30 ++ .../en-us/etc/e-smith/web/functions/domains | 240 +++++++++ root/etc/e-smith/web/common/.gitignore | 0 root/etc/e-smith/web/functions/domains | 186 +++++++ .../web/panels/manager/cgi-bin/.gitignore | 0 .../web/panels/manager/common/.gitignore | 0 .../web/panels/manager/html/.gitignore | 0 .../esmith/FormMagick/Panel/domains.pm | 484 ++++++++++++++++++ 16 files changed, 1687 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 additional/COPYING create mode 100644 contriborbase create mode 100755 createlinks create mode 100644 e-smith-domains.spec create mode 100644 root/etc/e-smith/db/domains/migrate/10sanitise-db create mode 100644 root/etc/e-smith/db/domains/migrate/20nameservers create mode 100755 root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains create mode 100644 root/etc/e-smith/web/common/.gitignore create mode 100755 root/etc/e-smith/web/functions/domains create mode 100644 root/etc/e-smith/web/panels/manager/cgi-bin/.gitignore create mode 100644 root/etc/e-smith/web/panels/manager/common/.gitignore create mode 100644 root/etc/e-smith/web/panels/manager/html/.gitignore create mode 100644 root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e594810 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.rpm +*.log +*spec-20* +*.tar.xz diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ea52ff8 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: e-smith-domains +# $Id: Makefile,v 1.1 2016/02/04 23:33:14 vip-ire Exp $ +NAME := e-smith-domains +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/README.md b/README.md index 97acb06..6cff9f4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,17 @@ -# e-smith-domains +# e-smith-domains -SMEServer Koozali developed git repo for e-smith-domains smeserver \ No newline at end of file +SMEServer Koozali developed git repo for e-smith-domains smeserver + +## Wiki +
https://wiki.koozali.org/ + +## Bugzilla +Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-domains&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED) + +## Description + +
*This description has been generated by an LLM AI system and cannot be relied on to be fully correct.* +*Once it has been checked, then this comment will be deleted* +
+ +E-Smith-Domains is a software suite that is designed to help organizations manage their domains. It provides a secure and easy to use control panel that can be used to manage multiple domains for a single organization. It is also designed to provide secure and reliable DNS hosting services, allowing organizations to control their domain's DNS records. Additionally, it provides an intuitive web-based interface that makes managing domains easy and straightforward. All of this is combined with robust security measures to ensure that each domain is protected and secure. diff --git a/additional/COPYING b/additional/COPYING new file mode 100644 index 0000000..eeb586b --- /dev/null +++ b/additional/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 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. diff --git a/contriborbase b/contriborbase new file mode 100644 index 0000000..ef36a67 --- /dev/null +++ b/contriborbase @@ -0,0 +1 @@ +sme10 diff --git a/createlinks b/createlinks new file mode 100755 index 0000000..22c5c68 --- /dev/null +++ b/createlinks @@ -0,0 +1,67 @@ +#!/usr/bin/perl -w + +use esmith::Build::CreateLinks qw(:all); + +#-------------------------------------------------- +# functions for manager panel +#-------------------------------------------------- +my $panel = "manager"; + +panel_link("domains", $panel); + +#-------------------------------------------------- +# actions for domain-create event +#-------------------------------------------------- + +$event = "domain-create"; + +safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/tinydns"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache.forwarder"); +templates2events("/var/service/dnscache/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/config", $event); +templates2events("/home/e-smith/ssl.pem/pem", $event); + +#-------------------------------------------------- +# actions for domain-delete event +#-------------------------------------------------- + +$event = "domain-delete"; + +safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/tinydns"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache.forwarder"); +templates2events("/var/service/dnscache/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/config", $event); +templates2events("/home/e-smith/ssl.pem/pem", $event); + +#-------------------------------------------------- +# actions for domain-modify event +#-------------------------------------------------- + +$event = "domain-modify"; + +templates2events("/home/e-smith/ssl.pem/pem", $event); +safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/tinydns"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache.forwarder"); +templates2events("/var/service/dnscache/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/config", $event); + +#-------------------------------------------------- +# actions for e-smith-domains-update event +#-------------------------------------------------- + +$event = "e-smith-domains-update"; + +templates2events("/home/e-smith/ssl.pem/pem", $event); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/tinydns"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache.forwarder"); +templates2events("/var/service/dnscache/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/root/servers/@", $event); +templates2events("/var/service/dnscache.forwarder/config", $event); + diff --git a/e-smith-domains.spec b/e-smith-domains.spec new file mode 100644 index 0000000..a973782 --- /dev/null +++ b/e-smith-domains.spec @@ -0,0 +1,274 @@ +# $Id: e-smith-domains.spec,v 1.6 2023/08/07 13:29:29 brianr Exp $ + +Summary: e-smith server and gateway - domains module +%define name e-smith-domains +Name: %{name} +%define version 2.6.0 +%define release 7 +Version: %{version} +Release: %{release}%{?dist} +License: GPL +Group: Networking/Daemons +Source: %{name}-%{version}.tar.xz + +BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot +BuildArchitectures: noarch +Requires: e-smith-base >= 4.13.15-76 +Requires: perl(HTML::Tabulate) >= 0.23 +Requires: e-smith-formmagick >= 1.4.0-12 +BuildRequires: perl(Test::Inline) >= 0.12 +BuildRequires: perl +BuildRequires: e-smith-devtools >= 1.11.0-03 +AutoReqProv: no + + +%description +e-smith server and gateway software - domains module. + +%changelog +* Thu Oct 26 2023 cvs2git.sh aka Brian Read 2.6.0-7.sme +- Roll up patches and move to git repo [SME: 12338] + +* Thu Oct 26 2023 BogusDateBot +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + +* Mon Aug 07 2023 Brian Read 2.6.0-6.sme + -Fix borders around table of domains [SME: 12392] + +* Wed Apr 07 2021 Jean-Philippe Pialasse 2.6.0-5.sme +- setup dns services on domain creation and other events [SME: 10115] + +* Fri Feb 26 2021 Jean-Philipe Pialasse 2.6.0-4.sme +- avoid encoding of utf strings in domain table [SME: 11391] + this will mess with some languages + +* Thu Dec 10 2020 Michel Begue 2.6.0-3.sme +- Create e-smith-domains-update event [SME: 11128] + +* Thu May 12 2016 Daniel Berteaud 2.6.0-2.sme +- Rebuild for [SME: 9393] + +* Fri Feb 5 2016 Daniel Berteaud 2.6.0-1.sme +- Roll new stream for sme10 + +* Mon Jul 6 2015 stephane de Labrusse 2.4.0-3.sme +- display variable name in the server-manager +- $domainName, $domainDesc $domain [SME: 8842] + +* Thu Apr 24 2014 stephane de Labrusse 2.4.0-2.sme +- Display a warning with the domain name before to remove it [SME: 8333] + +* Thu Jan 31 2013 Shad L. Lords 2.4.0-1.sme +- Roll new stream for sme9 + +* Tue Oct 7 2008 Shad L. Lords 2.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Sun Apr 27 2008 Jonathan Martens 1.4.0-11 +- Add common tags to e-smith-formmagick's general [SME: 4287] + +* Wed Mar 12 2008 Shad L. Lords 1.4.0-10 +- Cleanup CREATE/ADD tag mixup [SME: 4045] + +* Wed Feb 13 2008 Stephen Noble 1.4.0-9 +- Remove tags now in general [SME: 3926] + +* Fri Oct 26 2007 Charlie Brady 1.4.0-8 +- Fix removal of Corporate DNS setting (take III). [SME: 3415] + +* Sat Oct 20 2007 Charlie Brady 1.4.0-7 +- Add missing braces in last patch. [SME: 3415] + +* Tue Oct 16 2007 Charlie Brady 1.4.0-6 +- Allow Corporate DNS settings to be removed via panel. [SME: 3415] + +* Sun Apr 29 2007 Shad L. Lords +- Clean up spec so package can be built by koji/plague + +* Sat Jan 13 2007 Shad L. Lords 1.4.0-5 +- Remove references to virtual from panels [SME: 1517] + +* Thu Dec 07 2006 Shad L. Lords +- Update to new release naming. No functional changes. +- Make Packager generic + +* Thu Nov 09 2006 Gavin Weight 1.4.0-03 +- Missing period at the end of the description. [SME: 1852] + +* Sat Aug 19 2006 Gavin Weight 1.4.0-02 +- Added Text explaination for Corporate DNS Settings. [SME: 1852] + +* Wed Mar 15 2006 Charlie Brady 1.4.0-01 +- Roll stable stream version. [SME: 1016] + +* Sat Feb 18 2006 Gavin Weight 1.3.3-6 +- Table and columns headers not translated. [SME: 809] + +* Mon Jan 23 2006 Gordon Rowell 1.3.3-05 +- Remove empty pre and post scriptlets. In some cases they cause + package upgrade failures. [SME: 544] + +* Wed Nov 30 2005 Gordon Rowell 1.3.3-04 +- Bump release number only + +* Sun Nov 27 2005 Charlie Brady +- [1.3.3-03] +- Regenerate tinydns data file during domain-{create,delete,modify}. + [SF: 1366653] + +* Tue Nov 15 2005 Gordon Rowell +- [1.3.3-02] +- Use a single validator for domain names and complain if the + validation fails. Previously hyphens passed the panel validator + but failed on add (or delete). +- TODO: Strengthen the regexp [SF: 1352880] + +* Fri Oct 14 2005 Gordon Rowell +- [1.3.3-01] +- Remove L10Ns from base packages [SF: 1309520] + +* Fri Oct 14 2005 Gordon Rowell +- [1.3.2-01] +- New dev stream before relocating L10Ns + +* Fri Sep 30 2005 Gordon Rowell +- [1.3.1-05] +- Added Italian L10N - Thanks Filippo Carletti [SF: 1309266] + +* Mon Sep 26 2005 Gordon Rowell +- [1.3.1-04] +- French L10N fixups (and reformat) - Thanks Didier Rambeau [SF: 1293787] + +* Mon Sep 26 2005 Gordon Rowell +- [1.3.1-03] +- Added German L10N - Thanks Dietmar Berteld [SF: 1293325] + +* Thu Aug 25 2005 Gordon Rowell +- [1.3.1-02] +- Rewrite with CGI::FormMagick and HTML::Tabulate +- Added corporate DNS settings with page to change them +- Update to HTML::Tabulate 0.23 so that the remove link goes + away when we don't want it - Thanks to Gavin Carr for the + immediate patch turnaround. +- Only add "Corporate DNS Servers" to picklist if configured +- Migrate all domains in domains db, defaulting system domain to + 'localhost', and others to 'internet' +- Remove table border, and change stripe colour to match other buttons +- Add calls to signal-event for create/modify/delete +- TODO: Insert name of domain to be deleted on remove page +- Signal the dns-update event when DNS configuration is changed +- Migrate the Nameserver property to the Nameservers + +* Thu Aug 25 2005 Charlie Brady +- [1.3.1-01] +- Roll new development stream prior to adding support for delegation to + Corporate Nameservers. + +* Wed Jul 27 2005 Charlie Brady +- [1.3.0-07] +- Remove dangling tinydns-conf symlinks.[SF: 1240099] + +* Sat Mar 19 2005 Charlie Brady +- [1.3.0-06] +- Replace obsolete conf-mod_ssl symlink with fodder for + generic_expand_template. + +* Tue Dec 28 2004 Charlie Brady +- [1.3.0-05] +- Set non-empty path so domain panel can restart apache. + [charlieb MN00050181] + +* Tue Sep 28 2004 Michael Soulier +- [1.3.0-04] +- Updated requires with new perl dependencies. [msoulier MN00040240] + +* Tue Jul 13 2004 Michael Soulier +- [1.3.0-03] +- Added big, red reboot warning. [msoulier MN00041156] + +* Tue Jul 13 2004 Michael Soulier +- [1.3.0-02] +- Whitespace fix. + +* Wed Feb 4 2004 Michael Soulier +- [1.3.0-01] +- rolling to dev - 1.3.0 + +* Wed Feb 4 2004 Michael Soulier +- [1.2.0-01] +- rolling to stable - 1.2.0 + +* Mon Oct 20 2003 Michael Soulier +- [1.1.0-03] +- Fixed the red success message. [msoulier 9265] + +* Tue Sep 23 2003 Mark Knox +- [1.1.0-02] +- Removed reserved 'secure.domain' name as it is no longer a special + case [markk 8989] + +* Tue Sep 23 2003 Mark Knox +- [1.1.0-01] +- Rolling to development stream - 1.1.0 + +* Sun Sep 14 2003 Charlie Brady +- [1.0.0-08] +- Remove xinetd-reload from domain-{create,delete,modify} events. + [charlieb 9804] + +* Mon Aug 25 2003 Charlie Brady +- [1.0.0-07] +- Reconfig tinydns when adding/removing a domain. [charlieb 9642] + +* Tue Jun 24 2003 Gordon Rowell +- [1.0.0-06] +- Spanish nav bar [gordonr 9153] + +* Tue Jun 17 2003 Gordon Rowell +- [1.0.0-05] +- c&p error in change 1.0.0-02 [gordonr 8954] + +* Thu Jun 12 2003 Gordon Rowell +- [1.0.0-04] +- Added order tags to migrate fragments [gordonr 9015] + +* Tue Jun 10 2003 Charlie Brady +- [1.0.0-03] +- Fix wrong DB name in warning message. [charlieb 8954] + +* Tue Jun 10 2003 Charlie Brady +- [1.0.0-02] +- Force domain names to lower case - DNS is case insensitive. [charlieb 8954] + +* Thu May 8 2003 Mark Knox +- [1.0.0-01] +- Initial release. This module used to be part of e-smith-base. [markk 8610] + +%prep +%setup + +%build +LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \ + -type f | grep -v CVS | grep -v pleasewait) +for lexicon in $LEXICONS +do + /sbin/e-smith/validate-lexicon $lexicon +done + +/sbin/e-smith/generate-lexicons + +perl createlinks + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + > %{name}-%{version}-%{release}-filelist +echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f %{name}-%{version}-%{release}-filelist +%defattr(-,root,root) diff --git a/root/etc/e-smith/db/domains/migrate/10sanitise-db b/root/etc/e-smith/db/domains/migrate/10sanitise-db new file mode 100644 index 0000000..02b88f5 --- /dev/null +++ b/root/etc/e-smith/db/domains/migrate/10sanitise-db @@ -0,0 +1,24 @@ +{ + # vim: ft=perl ts=4 sw=4 et: + foreach my $domain ( $DB->get_all ) + { + my $lc_key = lc( $domain->key ); + + next if ( $lc_key eq $domain->key ); + + my $rec = $DB->get($lc_key); + + if ($rec) + { + warn "DomainsDB: " + . $domain->key + . " NOT migrated as $lc_key exists\n"; + next; + } + + $rec = $DB->new_record($lc_key); + $rec->merge_props( $domain->props ); + + $domain->delete; + } +} diff --git a/root/etc/e-smith/db/domains/migrate/20nameservers b/root/etc/e-smith/db/domains/migrate/20nameservers new file mode 100644 index 0000000..90cdd80 --- /dev/null +++ b/root/etc/e-smith/db/domains/migrate/20nameservers @@ -0,0 +1,30 @@ +{ + # vim: ft=perl ts=4 sw=4 et: + + use esmith::ConfigDB; + + my $db = esmith::ConfigDB->open_ro; + + for my $domain ( $DB->get_all ) + { + my %props = $domain->props; + + if (exists $props{Nameserver}) + { + $props{Nameservers} ||= $props{Nameserver}; + $domain->delete_prop("Nameserver"); + } + + if (($props{Nameservers} || '') eq 'corporate') + { + $props{Nameservers} = '' + unless ($db->get_prop('dnscache', 'Forwarder')); + } + + $props{Nameservers} ||= (($props{SystemPrimaryDomain}||'no') eq 'yes') ? + 'localhost' : 'internet'; + + + $domain->merge_props(%props); + } +} diff --git a/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains b/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains new file mode 100755 index 0000000..482f5a3 --- /dev/null +++ b/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains @@ -0,0 +1,240 @@ + + + + FORM_TITLE + + Manage domains + + + + FORM_DESCRIPTION + + When you create a domain, your server will be able to + receive e-mail for that domain and will also be able to host a + web site for that domain.

+

Add domain + + ]]> + + + + NO_VIRTUAL_DOMAINS + + There are no domains in the system. + + + + CURRENT_LIST_OF_DOMAINS + + Current list of domains + + + + PRIMARY_SITE + + primary site + + + + CONTENT + + {$content} i-bay + + + + CREATE_TITLE + + Create a new domain + + + + CONTENT_FIELD_DESCRIPTION + + For the web site, you may choose your primary web site or any + i-bay as the content. + + + + DOMAIN_NAME_VALIDATION_ERROR + + Error: unexpected or missing characters in domain name + {$domainName}. The domain name should contain one or more + letters, numbers, periods and minus signs. Did not create new + domain. + + + + DOMAIN_DESCRIPTION_VALIDATION_ERROR + + Error: unexpected or missing characters in domain description + {$domainDesc}. Did not create new domain. + + + + DOMAIN_IN_USE_ERROR + + Error: domain {$domainName} is already in use. Did not create + new domain. + + + + SYSTEM_DOMAIN_ERROR + + Error: domain {$domainName} is your system domain name. You + cannot have a domain with the same name. Did not create + new domain. + + + + SUCCESSFULLY_CREATED + + Successfully created domain {$domainName}. Your web + server is now being restarted. The links on this page will be + inactive until the web server restart is complete. + + + + MODIFY_TITLE + + Modify domain + + + + NONEXISTENT_DOMAIN_ERROR + + Error: {$domainName} is not an existing domain. + + + + SUCCESSFULLY_MODIFIED + + Successfully modified domain {$domainName}. Your web + server is now being restarted. The links on this page will be + inactive until the web server restart is complete. + + + + REMOVE_TITLE + + Remove domain + + + + REMOVE_DESCRIPTION + + + You are about to remove the domain {$domain} + ({$domainDesc}). +

+

+ Are you sure you wish to remove this domain? +

+ ]]> + + + + ERROR_WHILE_REMOVING_DOMAIN + + Error: internal failure while removing domain + {$domain}. + + + + SUCCESSFULLY_DELETED + + Successfully deleted domain {$domain}. Your web server + is now being restarted. The links on this page will be inactive + until the web server restart is complete. + + + + + DESC_CORPORATE_DNS_CURRENT +

Corporate DNS Settings

+ ]]> + + + + + BUTTON_CORPORATE_DNS + If this server does not have access to the Internet, or you have special +requirements for DNS resolution, enter the DNS server IP address here. + +You should not enter the address of your ISP's DNS servers here, as the server +is capable of resolving all Internet DNS names without this additional +configuration.

+

Modify corporate DNS settings + ]]> + + + + + DESC_CORPORATE_DNS + + If this server does not have access to the Internet, or + you have special requirements for DNS resolution, + enter the DNS server IP addresses here. + These fields should be left blank unless + you have a specific reason to configure other DNS servers. + You should not enter the address of your ISP's DNS servers + here, as the server is capable of resolving all + Internet DNS names without this additional configuration. + + + + + LABEL_CORPORATE_DNS_PRIMARY + Primary corporate DNS server + + + + LABEL_CORPORATE_DNS_SECONDARY + Secondary corporate DNS server + + + + DESC_NAMESERVERS + + You can select whether this domain is resolved locally, + passed to the corporate DNS servers, or resolved by + the Internet DNS servers. The default will be correct + for most networks. + + + + + LABEL_NAMESERVERS + Domain DNS servers + + + + localhost + Resolve locally + + + + internet + Internet DNS servers + + + + corporate + Corporate DNS servers + + + REMOVE_DESC + You are about to remove the domain + + + REMOVE_DESC2 + Are you sure you wish to remove this Domain ? + + + diff --git a/root/etc/e-smith/web/common/.gitignore b/root/etc/e-smith/web/common/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/web/functions/domains b/root/etc/e-smith/web/functions/domains new file mode 100755 index 0000000..01f6457 --- /dev/null +++ b/root/etc/e-smith/web/functions/domains @@ -0,0 +1,186 @@ +#!/usr/bin/perl -wT + +# vim: ts=4 sw=4 et: +#---------------------------------------------------------------------- +# heading : Configuration +# description : DOMAINS +# navigation : 6000 6600 +#---------------------------------------------------------------------- +#---------------------------------------------------------------------- +# copyright (C) 1999-2005 Mitel Networks Corporation +# Copyright 2005 Gordon Rowell +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#---------------------------------------------------------------------- + +use strict; +use esmith::TestUtils; +use esmith::FormMagick::Panel::domains; + +my $fm = esmith::FormMagick::Panel::domains->new(); + +$fm->display(); + +=pod + +=head1 NAME + +domains -- create/modify/delete domains + +=head2 DESCRIPTION + +This screen allows the administrator to create, modify or delete +domains. + +=begin testing + +=end testing + +=cut + + +__DATA__ +

+ + + + FORM_DESCRIPTION + + + + + DESC_CORPORATE_DNS_CURRENT + + + + + + + + + + + + BUTTON_CORPORATE_DNS + + + + + + + CREATE_TITLE + + + + + + + + + + + + + CONTENT_FIELD_DESCRIPTION + + + + + + DESC_NAMESERVERS + + + + + + + + MODIFY_TITLE + + + + + + + + + + + + + CONTENT_FIELD_DESCRIPTION + + + + + + DESC_NAMESERVERS + + + + + + + + REMOVE_TITLE + + + + + + + + + + + DESC_CORPORATE_DNS + + + + + + + + + +
diff --git a/root/etc/e-smith/web/panels/manager/cgi-bin/.gitignore b/root/etc/e-smith/web/panels/manager/cgi-bin/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/web/panels/manager/common/.gitignore b/root/etc/e-smith/web/panels/manager/common/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/web/panels/manager/html/.gitignore b/root/etc/e-smith/web/panels/manager/html/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm new file mode 100644 index 0000000..c571892 --- /dev/null +++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm @@ -0,0 +1,484 @@ +#!/usr/bin/perl -w + +#---------------------------------------------------------------------- +# $Id: domains.pm,v 1.1 2005/08/25 17:51:33 charlieb Exp $ +#---------------------------------------------------------------------- +# copyright (C) 1999-2005 Mitel Networks Corporation +# Copyright 2005 Gordon Rowell +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#---------------------------------------------------------------------- +package esmith::FormMagick::Panel::domains; + +use strict; + +use esmith::FormMagick; +use esmith::AccountsDB; +use esmith::DomainsDB; +use esmith::ConfigDB; +use Exporter; +use Carp qw(verbose); + +use HTML::Tabulate; + +our @ISA = qw(esmith::FormMagick Exporter); + +our @EXPORT = qw( getExtraParams ); + +our $VERSION = sprintf '%d.%03d', q$Revision: 1.1 $ =~ /: (\d+).(\d+)/; + +our $db = esmith::ConfigDB->open(); +our $ddb = esmith::DomainsDB->open(); +our $adb = esmith::AccountsDB->open_ro(); + +our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+); + +=pod + +=head1 NAME + +esmith::FormMagick::Panels::domains - Domains panel functions + +=head1 SYNOPSIS + +use esmith::FormMagick::Panels::domains; + +my $panel = esmith::FormMagick::Panel::domains->new(); +$panel->display(); + +=head1 DESCRIPTION + + +=head2 new(); + +Exactly as for esmith::FormMagick + +=begin testing + +$ENV{ESMITH_DOMAINS_DB} = "10e-smith-base/domains.conf"; +$ENV{ESMITH_CONFIG_DB} = "10e-smith-base/configuration.conf"; + +open DATA, "echo '
'|"; +use_ok('esmith::FormMagick::Panel::domains'); +use vars qw($panel); +ok($panel = esmith::FormMagick::Panel::domains->new(), +"Create panel object"); +close DATA; +isa_ok($panel, 'esmith::FormMagick::Panel::domains'); +$panel->{cgi} = CGI->new(); +$panel->parse_xml(); + +{ package esmith::FormMagick::Panel::domains; +our $domainsdb; +::isa_ok($domainsdb, 'esmith::DomainsDB'); +} + +=end testing + +=cut + +sub new { + shift; + my $self = esmith::FormMagick->new(); + $self->{calling_package} = (caller)[0]; + bless $self; + return $self; +} + +=head1 HTML GENERATION ROUTINES + +Routines for generating chunks of HTML needed by the panel. + +=head2 print_domains_table + +Prints out the domains table on the front page. + +=cut + +sub print_domains_table +{ + my $self = shift; + my $q = $self->{cgi}; + + my $domains_table = + { + title => $self->localise('CURRENT_LIST_OF_DOMAINS'), + + #stripe => '#D4D0C8', + + fields => [ qw(Domain Description Content Nameservers Modify Remove) ], + + labels => 1, + + field_attr => { + Domain => { label_escape => 0, escape => 0, label => + $self->localise('DOMAIN_NAME') }, + Description => { label_escape => 0, escape => 0, label => + $self->localise('DESCRIPTION_BRIEF') }, + Content => { label_escape => 0, escape => 0, label => $self->localise('CONTENT') }, + Nameservers => { label_escape => 0, escape => 0, label => $self->localise('LABEL_NAMESERVERS') }, + Modify => { label_escape => 0, escape => 0, label => $self->localise('MODIFY'), + link => \&modify_link }, + Remove => { label_escape => 0, escape => 0, label => $self->localise('REMOVE'), + link => \&remove_link, + value => \&remove_value }, + }, + + table => {class=> "sme-border"}, + th => {class => "sme-border"}, + tr => {class => "sme-border"}, + td => {class => "sme-border"}, + + + }; + + my @data = (); + + my $modify = $self->localise('MODIFY'); + my $remove = $self->localise('REMOVE'); + + for ($ddb->domains) + { + my $ns = $_->prop('Nameservers') || 'internet'; + + push @data, + { Domain => $_->key, $_->props, + Modify => $modify, Remove => $remove, + Nameservers => $self->localise($ns), + } + } + + my $t = HTML::Tabulate->new($domains_table); + + $t->render(\@data, $domains_table); +} + +sub modify_link +{ + my ($data_item, $row, $field) = @_; + + return "domains?page=0&page_stack=&Next=Next&Domain=" . + $row->{Domain} . "&wherenext=DOMAINS_PAGE_MODIFY"; +} + +sub remove_link +{ + my ($data_item, $row, $field) = @_; + + return undef if (($row->{Removable} || "yes") eq "no"); + + return "domains?page=0&page_stack=&Next=Next&Domain=" . + $row->{Domain} . "&wherenext=DOMAINS_PAGE_REMOVE"; +} + +sub remove_value +{ + my ($data_item, $row, $field) = @_; + + return "" if (($row->{Removable} || "yes") eq "no"); + + return $row->{Remove}; +} + +sub get_content_options +{ + my $self = shift; + + # We do some subversion here to localize the label of "Primary". + my %options = map { $_->key => $_->prop('Name') } + grep { $_->key ne "Primary" } $adb->ibays; + + $options{'Primary'} = $self->localise('PRIMARY_SITE'); + + return \%options +} + +sub get_content_value +{ + my $self = shift; + my $q = $self->{cgi}; + + my $domain = $q->param('Domain') || undef; + + return $domain ? $ddb->get_prop($domain, 'Content') : 'Primary'; +} + +sub get_description_value +{ + my $self = shift; + my $q = $self->{cgi}; + + my $domain = $q->param('Domain') || undef; + + return $ddb->get_prop($domain, 'Description'); +} + +sub get_nameserver_options +{ + my $self = shift; + my $q = $self->{cgi}; + + my $domain = $q->param('Domain') || undef; + + my @options = qw(localhost internet); + + push @options, 'corporate' if ($db->get_prop('dnscache', 'Forwarder')); + + my $ns = ($ddb->get_prop($domain, 'Nameservers') || 'internet'); + + push @options, $ns unless scalar grep { /^$ns$/ } @options; + + return \@options; +} + +sub get_nameserver_value +{ + my $self = shift; + my $q = $self->{cgi}; + + my $domain = $q->param('Domain') || undef; + + return ($ddb->get_prop($domain, 'Nameservers') || 'internet'); +} + +sub validate_Domain +{ + my $self = shift; + my $domain = lc shift; + + return ($domain =~ /^($REGEXP_DOMAIN)$/) ? 'OK' : + 'DOMAIN_NAME_VALIDATION_ERROR'; +} + +sub validate_Description +{ + # XXX - FIXME - NOTREACHED + # We used to use the Description in the Appletalk volume name + # which meant it needed validation. I don't see any reason to + # do this any more + + my $self = shift; + my $description = shift; + + return ($description =~ /^([\-\'\w][\-\'\w\s\.]*)$/) ? 'OK' : + 'DOMAIN_DESCRIPTION_VALIDATION_ERROR'; +} + +sub ip_number_or_blank +{ + # XXX - FIXME - we should push this down into CGI::FormMagick + + my $self = shift; + my $ip = shift; + + if (!defined($ip) || $ip eq "") + { + return 'OK'; + } + + return CGI::FormMagick::Validator::ip_number($self, $ip); +} + +=head2 get_prop ITEM PROP + +A simple accessor for esmith::ConfigDB::Record::prop + +=cut + +sub get_prop +{ + # XXX - FIXME - we should push this down to esmith::FormMagick + + my ($self, $item, $prop, $default) = @_; + + return $db->get_prop($item, $prop) || $default; +} + +sub modify_dns +{ + my ($fm) = @_; + my $q = $fm->{'cgi'}; + + my $forwarder = $q->param('Forwarder') || ''; + my $forwarder2 = $q->param('Forwarder2') || ''; + my $dnscache = $db->get('dnscache'); + + ($forwarder, $forwarder2) = ($forwarder2, '') + if ($forwarder2 and not $forwarder); + + if ($forwarder) + { + $dnscache->set_prop('Forwarder', $forwarder); + } + else + { + $dnscache->delete_prop('Forwarder'); + } + if ($forwarder2) + { + $dnscache->set_prop('Forwarder2', $forwarder2); + } + else + { + $dnscache->delete_prop('Forwarder2'); + } + + unless ( system( "/sbin/e-smith/signal-event", "dns-update" ) == 0 ) + { + $fm->error('ERROR_UPDATING'); + return undef; + } + + return $fm->success('SUCCESS'); +} + +sub create_modify_domain +{ + my ($fm, $action) = @_; + my $q = $fm->{'cgi'}; + + my $domain = $q->param('Domain'); + + $domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); + + unless ($domain) + { + $fm->error($action eq 'create' ? 'ERROR_CREATING_DOMAIN' + : 'ERROR_MODIFYING_DOMAIN'); + return undef; + } + + my $rec = $ddb->get($domain); + + if ($rec and $action eq 'create') + { + $fm->error('DOMAIN_IN_USE_ERROR'); + return undef; + } + + if (not $rec and $action eq 'modify') + { + $fm->error('NONEXISTENT_DOMAIN_ERROR'); + return undef; + } + + $rec ||= $ddb->new_record($domain, { type => 'domain' }); + + my %props; + + $props{$_} = $q->param($_) for ( qw(Content Description Nameservers) ); + + $rec->merge_props(%props); + + my $status = system( "/sbin/e-smith/signal-event", + "domain-$action", "$domain" ); + + if ($status) + { + $fm->error($action eq 'create' ? 'ERROR_CREATING_DOMAIN' + : 'ERROR_MODIFYING_DOMAIN'); + return undef; + } + + $fm->success($action eq 'create' ? 'SUCCESSFULLY_CREATED' + : 'SUCCESSFULLY_MODIFIED'); +} + +sub delete_domain +{ + my ($fm, $action) = @_; + my $q = $fm->{'cgi'}; + + my $domain = $q->param('Domain'); + + $domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); + + unless ($domain) + { + $fm->error('ERROR_WHILE_REMOVING_DOMAIN'); + return undef; + } + + my $rec = $ddb->get($domain); + + if (not $rec) + { + $fm->error('NONEXISTENT_DOMAIN_ERROR'); + return undef; + } + + $rec->set_prop('type', 'domain-deleted'); + + if (system("/sbin/e-smith/signal-event", "domain-delete", "$domain") == 0) + { + $rec->delete; + return $fm->success('SUCCESSFULLY_DELETED'); + } + + return $fm->error('ERROR_WHILE_REMOVING_DOMAIN'); +} + +=head2 print_page_description($self, "remove") + +Generates the page description for the Remove Domain page. + +=cut + +sub print_page_description { + my ($self, $pagename) = @_; + unless (grep /^$pagename$/, qw(remove)) { + warn "Can't generate page description for invalid pagename $pagename\n"; + return; + } + + $pagename = uc($pagename); + + my $desc = $self->localise("${pagename}_DESC"); + my $desc2 = $self->localise("${pagename}_DESC2"); + + my ($fm, $action) = @_; + my $q = $fm->{'cgi'}; + my $domain = $q->param('Domain'); + my $domain_description = $ddb->get_prop("$domain",'Description'); + print qq{ + +

$desc "$domain" ($domain_description)

+ $desc2 + + }; + + return; +} + +=head2 getExtraParams() +Sets variables used in the lexicon to their required values. +=for testing +$panel->{cgi}->param(-name=>'name', -value=>'foo'); +my %ret = $panel->getExtraParams(); +is($ret{name}, 'foo', ' .. name field is foo'); +isnt($ret{description}, undef, ' .. description field isnt undef'); +=cut + +sub getExtraParams +{ + my $self = shift; + my $q = $self->{cgi}; + my $domain= $q->param('Domain'); + my $domaindesc = $ddb->get_prop($domain, 'Description'); + + return (domain => $domain, domainDesc => $domaindesc, domainName => $domain); +} + +1;