From d4ad9b87d5666e7355e997347470e814985eaabc Mon Sep 17 00:00:00 2001 From: Brian Read Date: Wed, 12 Jul 2023 09:07:49 +0100 Subject: [PATCH] initial commit of file from CVS for e-smith-quota on Wed 12 Jul 09:07:49 BST 2023 --- .gitignore | 4 + Makefile | 21 + README.md | 18 +- additional/COPYING | 340 +++++++++++ additional/e-smith-quota.spec | 444 ++++++++++++++ contriborbase | 1 + createlinks | 16 + e-smith-quota.spec | 563 ++++++++++++++++++ root/etc/cron.d/warnquota | 2 + .../e-smith/events/actions/user-modify-quota | 227 +++++++ .../en-us/etc/e-smith/web/functions/quota | 130 ++++ .../templates/etc/fstab/50EnableQuotas | 11 + .../lib/e-smith-quota/adminQuotaSummary.tmpl | 44 ++ .../usr/lib/e-smith-quota/userOverQuota.tmpl | 31 + .../etc/e-smith/tests/50-e-smith-quota/.dummy | 0 root/etc/e-smith/web/functions/quota | 49 ++ root/sbin/e-smith/warnquota | 294 +++++++++ .../en_US/LC_MESSAGES/adminQuotaSummary.po | 51 ++ .../locale/en_US/LC_MESSAGES/userOverQuota.po | 58 ++ .../esmith/FormMagick/Panel/quota.pm | 412 +++++++++++++ 20 files changed, 2714 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 additional/COPYING create mode 100644 additional/e-smith-quota.spec create mode 100644 contriborbase create mode 100644 createlinks create mode 100644 e-smith-quota.spec create mode 100644 root/etc/cron.d/warnquota create mode 100644 root/etc/e-smith/events/actions/user-modify-quota create mode 100644 root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota create mode 100644 root/etc/e-smith/templates/etc/fstab/50EnableQuotas create mode 100644 root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl create mode 100644 root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl create mode 100644 root/etc/e-smith/tests/50-e-smith-quota/.dummy create mode 100644 root/etc/e-smith/web/functions/quota create mode 100644 root/sbin/e-smith/warnquota create mode 100644 root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.po create mode 100644 root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.po create mode 100644 root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/quota.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..9389c4a --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: e-smith-quota +# $Id: Makefile,v 1.1 2016/02/05 21:40:00 stephdl Exp $ +NAME := e-smith-quota +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 377f72f..ec5600e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,17 @@ -# e-smith-quota +# e-smith-quota -SMEServer Koozali developed git repo for e-smith-quota smeserver \ No newline at end of file +SMEServer Koozali developed git repo for e-smith-quota smeserver + +## Wiki +
https://wiki.koozali.org/ + +## Bugzilla +Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-quota&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-quota is a software solution designed to help organizations manage their user quotas. It offers comprehensive quota management capabilities, enabling organizations to easily set, monitor, and enforce user quotas. It can be used to manage a variety of resources, including disk space, FTP access, and email accounts. It also provides reporting and alerting functions, enabling organizations to remain informed about their quota usage and take necessary actions quickly. Additionally, it offers a number of customization options, allowing organizations to tailor the software to their specific needs. E-smith-quota is a great choice for organizations looking to effectively manage their user quotas. 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/additional/e-smith-quota.spec b/additional/e-smith-quota.spec new file mode 100644 index 0000000..855ece4 --- /dev/null +++ b/additional/e-smith-quota.spec @@ -0,0 +1,444 @@ +Summary: e-smith server and gateway - quota module +%define name e-smith-quota +Name: %{name} +%define version 1.9.2 +%define release 01 +Version: %{version} +Release: %{release} +License: GPL +Group: System Environment/Base +Source: %{name}-%{version}.tar.gz +Packager: e-smith developers +BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot +BuildArchitectures: noarch +Requires: e-smith-base >= 4.9.129, quota >= 3, perl-Quota +Requires: e-smith-lib >= 1.13.1 +BuildRequires: e-smith-devtools >= 1.11.0-03, e-smith-test >= 0.1.12 +AutoReqProv: no + +%description +e-smith server and gateway software - quota module. + +%changelog +* Fri Oct 14 2005 Gordon Rowell +- [1.9.2-01] +- Remove L10Ns from base packages [SF: 1309520] + +* Fri Oct 14 2005 Gordon Rowell +- [1.9.1-01] +- New dev stream before relocating L10Ns + +* Tue Oct 4 2005 Charlie Brady +- [1.9.0-14] +- Fix L10N in over-quota warning messages. [SF: 1312830] + +* Fri Sep 30 2005 Gordon Rowell +- [1.9.0-13] +- Added Italian L10N - Thanks Filippo Carletti [SF: 1309266] + +* Mon Sep 26 2005 Gordon Rowell +- [1.9.0-12] +- Added German L10N - Thanks Dietmar Berteld [SF: 1293325] + +* Tue Jul 19 2005 Charlie Brady +- [1.9.0-11] +- Update to current db access APIs (patches by Shad and Charlie) [SF: 1216546] + +* Wed Jul 13 2005 Charlie Brady +- [1.9.0-10] +- Add quota setup in fstab templates (moved from e-smith-base). + +* Mon Jun 27 2005 Charlie Brady +- [1.9.0-09] +- Really fix permissions of /etc/cron.d/warnquota. [SF: 1226700] + +* Fri Jun 24 2005 Charlie Brady +- [1.9.0-08] +- Make perms of /etc/cron.d/warnquota acceptible to latest crond. + [SF: 1226700] + +* Thu Mar 17 2005 Charlie Brady +- [1.9.0-07] +- Fix some perl anachronisms which elicit warnings. [MN00075093] + +* Thu Mar 10 2005 Charlie Brady +- [1.9.0-06] +- Update success and error messages to use new convention + (patch submitted by Shad Lords). + +* Wed Dec 29 2004 Charlie Brady +- [1.9.0-05] +- Remount / with quota support before trying to create quota + files. [MN00061221] + +* Fri Dec 24 2004 Charlie Brady +- [1.9.0-04] +- Fix rc.quota_create's check for existing quota file, and add + convertquota calls, in case of old style quota files. + [MN00061221] + +* Thu Dec 16 2004 Charlie Brady +- [1.9.0-03] +- Run /etc/rc.d/rc.quota_create before rc.sysinit, to enable + filesystem quota support. [charlieb MN00061221] + +* Wed Nov 10 2004 Charlie Brady +- [1.9.0-02] +- Untaint acct before using in system(). [charlieb MN00050161] + +* Wed Nov 10 2004 Charlie Brady +- [1.9.0-01] +- Changing version to development stream number - 1.9.0 + +* Thu Jun 26 2003 Charlie Brady +- [1.8.0-01] +- Changing version to stable stream number - 1.8.0 + +* Tue Jun 24 2003 Gordon Rowell +- [1.7.0-22] +- Spanish nav bar [gordonr 9153] + +* Fri May 30 2003 Mark Knox +- [1.7.0-21] +- Whoops. Don't need /usr/lib/e-smith-quota anymore. Removed [markk 8847] + +* Fri May 30 2003 Mark Knox +- [1.7.0-20] +- Create template output dir in %build, and fragments need Locale::gettext + [markk 8847] + +* Fri May 30 2003 Charlie Brady +- [1.7.0-19] +- Move fstab fragment into e-smith-base. [charlieb 8868] + +* Tue May 6 2003 Lijie Deng +- [1.7.0-18] +- Add Spanish lexicon for quota [lijied 3793] + +* Thu Apr 17 2003 Lijie Deng +- [1.7.0-17] +- Standardize the Add/Remove/Save button name [lijied 7921] + +* Thu Apr 10 2003 Lijie Deng +- [1.7.0-16] +- Change $q->table back [lijied 8034] + +* Fri Apr 4 2003 Lijie Deng +- [1.7.0-15] +- Change $q->table to $q->start_table where necessary [lijied 8034] + +* Thu Apr 3 2003 Lijie Deng +- [1.7.0-14] +- Removed SME Server branding [lijied 8016] + +* Fri Mar 28 2003 Lijie Deng +- [1.7.0-13] +- Modified /po/fr_CA to fr [lijied 6787] + +* Fri Mar 28 2003 Lijie Deng +- [1.7.0-12] +- Modified French lexicon to use lang="fr", rename the lexicon + directory to fr [lijied 6787] + +* Mon Mar 10 2003 Lijie Deng +- [1.7.0-11] +- Modified charset tag in .po file [lijied 3930] + +* Fri Mar 7 2003 Lijie Deng +- [1.7.0-10] +- Modified en-us and fr-ca panel title + modified en-us and fr-ca nav bar label [lijied 7356] +- Modified e-smith-devtools version [lijied 7578] + +* Thu Mar 6 2003 Lijie Deng +- [1.7.0-09] +- Modified quotas panel order [lijied 7356] +- Added French .po file to po/fr_CA, and modified the + %build in spec file [lijied 7442] + +* Tue Mar 4 2003 Lijie Deng +- [1.7.0-08] +- Split en-us lexicon from quota panel [lijied 4030] + +* Mon Mar 3 2003 Lijie Deng +- [1.7.0-07] +- Added French lexicon for quota. [lijied 5003] + +* Sat Jan 25 2003 Mike Dickson +- [1.7.0-06] +- added ACTION to the lexicon [miked 6363] + +* Wed Jan 1 2003 Gordon Rowell +- [1.7.0-05] +- Rewrote templates to use esmith::I18N [gordonr 5212] + +* Fri Dec 27 2002 Mike Dickson +- [1.7.0-04] +- minor UI update [miked 5494] + +* Mon Dec 9 2002 Mike Dickson +- [1.7.0-03] +- updates for new UI [miked 5494] + +* Thu Nov 21 2002 Mike Dickson +- [1.7.0-02] +- update to new UI system [miked 5494] + +* Wed Nov 20 2002 Mike Dickson +- [1.7.0-01] +- Changing to development stream; version upped to 1.7.0 + +* Wed Oct 16 2002 Gordon Rowell +- [1.6.1-03] +- Don't suppress quota warnings if hard limit is zero [gordonr 5230] + +* Tue Oct 15 2002 Charlie Brady +- [1.6.1-02] +- Fix I18N of From header in warning emails. Quote "full name" + part of From header (to be sure). [charlieb 5205] + +* Tue Oct 15 2002 Charlie Brady +- [1.6.1-01] +- Fix use of comma as string concat operator in overquota mail message + templates. Break some long lines while we are at it. [charlieb 5178] + +* Fri Oct 11 2002 Charlie Brady +- [1.6.0-01] +- Roll to maintained version number to 1.6.0 + +* Fri Oct 11 2002 Mark Knox +- [1.5.3-03] +- Improved unit suffix handling to more closely correspond to docs [markk 5102] +- Allow "unlimited" hard quota with soft quota [markk 5102] + +* Tue Oct 8 2002 Mark Knox +- [1.5.3-02] +- Improved error strings [markk 5102] + +* Wed Sep 25 2002 Mark Knox +- [1.5.3-01] +- Rolled version to clean up patch errors + +* Wed Sep 25 2002 Mark Knox +- [1.5.2-04] +- Clean up panel display and instructions [markk 4475] + +* Wed Sep 4 2002 Mark Knox +- [1.5.2-03] +- Disambiguated the explanation of how disk usage is calculated. [markk 4473] + +* Tue Aug 27 2002 Mark Knox +- [1.5.2-02] +- Display decimal values in summary screen [markk 4475] +- Allow entry of KB, MB, or GB values in modify panel [markk 4475] +- Choose and display "best" unit in modify panel [markk 4475] + +* Thu Aug 8 2002 Charlie Brady +- [1.5.2-01] +- Remove dangling enable-quota symlinks. [charlieb 4297] + +* Mon Aug 5 2002 Charlie Brady +- [1.5.1-01] +- Bump quota requirement to version 3. +- Fix fstab template to handle ext3 file systems. [charlieb 4297] +- Remove action script which runs quotacheck - this is now done by rc.sysinit + during reboot. [charlieb 4297] + +* Wed Jun 5 2002 Charlie Brady +- [1.5.0-01] +- Changing version to development stream number to 1.5.0 + +* Fri May 31 2002 Charlie Brady +- [1.4.0-01] +- Changing version to maintained stream number to 1.4.0 + +* Thu May 23 2002 Gordon Rowell +- [1.3.9-01] +- RPM rebuild forced by cvsroot2rpm + +* Sat May 18 2002 Gordon Rowell +- [1.3.8-01] +- Move enable-quota back into post-{install,upgrade}. Skip the quotacheck + if the quota files exist. For an install, they won't. For an upgrade + from a previously quota'ed system, they will and we don't want to + bother checking the whole filesystem during the upgrade. For an upgrade + from a pre-quota system they won't exist, so we need to check. + Note: /etc/fstab must have the quota options enabled before we attempt + to run quotacheck or it exits silently [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.7-01] +- Turn quotas on (well, off then on) after enabling quotas in case + we didn't enable them at boot time in an upgrade from version which + didn't have quotas [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.6-01] +- Re-add enable-quotas to post-install, after expansion of /etc/fstab + [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.5-01] +- Updated e-smith-base dependency [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.4-01] +- Relocated the scaffolding for /etc/fstab templates to e-smith-base, + leaving the enable quotas fragment here. The template is also expanded + with an action in e-smith-base. Updated e-smith-base Requires [gordonr 3439] + +* Mon May 13 2002 Gordon Rowell +- [1.3.3-01] +- Really fix createlinks [gordonr 3439] + +* Mon May 13 2002 Gordon Rowell +- [1.3.2-01] +- Actually run enable-quotas in bootstrap-console-save and fix + createlinks [gordonr 3439] + +* Mon May 13 2002 Gordon Rowell +- [1.3.1-01] +- Moving to stream 1.3.1 (1.3.0 skipped by accidentally) +- Check all quotas during bootstrap-console-save rather than + post-upgrade so that the install completes quickly, even on + a machine with lots of disk to check. [gordonr 3439] + +* Wed May 8 2002 Gordon Rowell +- [1.2.8-01] +- Subst scanmail.tmpl -> template name in both quota templates [markk 3029] +- Need to enable quotas before trying to restore them :-) [gordonr 2730] + +* Wed May 8 2002 Mark Knox +- [1.2.7-01] +- Added gettext in quota warning templates [markk 3029] + +* Tue May 7 2002 Gordon Rowell +- [1.2.6-01] +- Localised "Modify" link on main page [markk 3317] + +* Wed May 1 2002 Gordon Rowell +- [1.2.5-01] +- esmith::AccountDB -> esmith::AccountsDB [schwern 3287] + +* Wed Apr 24 2002 Gordon Rowell +- [1.2.4-01] +- Rewording SOFT/HARD errors for consistency [gordonr 3027] + +* Mon Apr 22 2002 Adrian Chung +- [1.2.3-01] +- Pass the $user object instead of the $username variable in user-modify-quota. + +* Tue Apr 16 2002 Mark Knox +- [1.2.2-01] +- Added a missing button in the modify user page [markk 3159] + +* Mon Apr 15 2002 Mark Knox +- [1.2.1-01] +- Adding warning for Quota::query failure to warnquota & user-modify-quota + [schwern 2730] +- Testing user-modify-quota [schwern 2729 2730] +- Converted to FormMagick panel and internationalized. Added some POD and + tests. [markk 3159] +- Added buildtests in %build [markk 3159] + +* Thu Mar 7 2002 Charlie Brady +- [1.2.0-01] +- rollRPM: Rolled version number too 1.2.0-01. Includes patches up to 1.0.0-02. +- DO NOT MAKE ANY FURTHER CHANGES TO THIS FILE, as this is the base version + being imported into CVS. + +* Fri Feb 01 2002 Charlie Brady +- [1.0.0-02] +- Allow hard and soft quota to be equal. This also allows the quota to be + removed. See #2729. +- Set quota limits for all users in post-upgrade event. This allows for + a system restore to have properly set up quotas. + +* Tue Dec 11 2001 Jason Miller +- [1.0.0-01] +- rollRPM: Rolled version number to 1.0.0-01. Includes patches up to 0.1.1-09. + +* Wed Dec 5 2001 Adrian Chung +- [0.1.1-09] +- Adding new warnquota script that sends mail to users who have exceeded their + "limit with grace time", and a summary report to admin. +- Adding admin summary template, and user quota warning template to + /etc/e-smith/templates/usr/lib/e-smith-quota + +* Wed Dec 5 2001 Adrian Chung +- [0.1.1-08] +- Adding check in panel to make sure that soft limit + is less than hard limit. +- Also insert missing subroutine prototype. + +* Thu Nov 15 2001 Adrian Chung +- [0.1.1-07] +- More text changes to the quota panel. +- Changed kB sizing output to mB sizing. +- Still no genSmallRedCellRightJustified. Yet. + +* Wed Nov 14 2001 Charlie Brady +- [0.1.1-06] +- Add daily quota warning script. For now, just use a wrapper for + /usr/sbin/warnquota. In time we will write our own script in perl + and produce a customised report. + +* Wed Nov 14 2001 Adrian Chung +- [0.1.1-05] +- Update createlinks to create manager quota panel link +- More text changes to quota panel. +- Use genSmallCellRightJustified +- Create "Modify" button. + +* Wed Nov 14 2001 Adrian Chung +- [0.1.1-04] +- Add some wording to panel, and change wording of + soft and hard limits to "limit with grace time" and + "immediate limit" +- Still to roll in genSmallCellRight + +* Tue Nov 13 2001 Charlie Brady +- [0.1.1-03] +- Add bare bones web panel which allows setting of soft and hard file limits. + +* Mon Nov 12 2001 Charlie Brady +- [0.1.1-02] +- Add action script to set and modify quotas using properties from the accounts + db. + +* Fri Nov 09 2001 Charlie Brady +- Initial + +%prep +%setup + +%build +mkdir -p root/etc/e-smith/events/post-{install,upgrade} +mkdir -p root/etc/e-smith/events/user-{create,modify} +mkdir -p root/etc/e-smith/web/panels/manager/cgi-bin + +xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.po \ + root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl +xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.po \ + root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl + +perl createlinks +/sbin/e-smith/buildtests 50-e-smith-quota + +/sbin/e-smith/generate-lexicons + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) +rm -f %{name}-%{version}-%{release}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --file /etc/rc.d/rc.quota_create 'attr(0755,root,root)' \ + --file /etc/cron.d/warnquota 'attr(0644,root,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/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 100644 index 0000000..88399e3 --- /dev/null +++ b/createlinks @@ -0,0 +1,16 @@ +#!/usr/bin/perl -w + +use esmith::Build::CreateLinks qw(:all); + +foreach (qw( + user-modify + bootstrap-console-save + user-create + e-smith-quota-update + )) +{ + event_link("user-modify-quota", $_, "50"); +} + +panel_link("quota", "manager"); + diff --git a/e-smith-quota.spec b/e-smith-quota.spec new file mode 100644 index 0000000..77f83d6 --- /dev/null +++ b/e-smith-quota.spec @@ -0,0 +1,563 @@ +# $Id: e-smith-quota.spec,v 1.5 2021/01/06 21:03:58 jpp Exp $ + +Summary: e-smith server and gateway - quota module +%define name e-smith-quota +Name: %{name} +%define version 2.6.0 +%define release 6 +Version: %{version} +Release: %{release}%{?dist} +License: GPL +Group: System Environment/Base +Source: %{name}-%{version}.tar.xz + +BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot +BuildArchitectures: noarch +Requires: e-smith-base >= 4.9.129, quota >= 3, perl-Quota +Requires: e-smith-lib >= 1.13.1 +Requires: e-smith-formmagick >= 1.4.0-12 +BuildRequires: e-smith-devtools >= 1.11.0-03 +BuildRequires: gettext +AutoReqProv: no + +%description +e-smith server and gateway software - quota module. + +%changelog +* Wed Jul 12 2023 cvs2git.sh aka Brian Read 2.6.0-6.sme +- Roll up patches and move to git repo [SME: 12338] + +* Wed Jul 12 2023 BogusDateBot +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + +* Wed Jan 06 2021 Jean-Philipe Pialasse 2.6.0-5.sme +- add update event [SME: 11154] + +* Wed Apr 05 2017 Jean-Philipe Pialasse 2.6.0-4.sme +- enable quota for groups and users with XFS [SME: 10211] + +* Thu May 12 2016 Daniel Berteaud 2.6.0-3.sme +- Use CreateLinks instead of local functions so panel links point on the + wrapper [SME: 9393] + +* Thu May 12 2016 Daniel Berteaud 2.6.0-2.sme +- Rebuild for [SME: 9393] + +* Fri Feb 05 2016 stephane de Labrusse 2.6.0-1.sme +- Initial release to sme10 + +* Sat May 04 2013 Ian Wells 2.4.0-2.sme +- Remove rc.quota_create [SME: 7227] +- For quota creation see [SME: 7229] + +* Tue Feb 12 2013 Ian Wells 2.4.0-1.sme +- Rolling for SME 9 +- Perl modules moved to /usr/share/perl5/vendor_perl [SME: 7223] + +* Sun Jan 1 2012 Ian Wells 2.2.0-10.sme +- Improve error message for quota [SME: 6797] + +* Fri Mar 11 2011 Ian Wells 2.2.0-9.sme +- Correct copy-paste error for $exponent [SME: 6545] + +* Sun Nov 28 2010 Ian Wells 2.2.0-8.sme +- Quota panel should only accept uppercase units [SME: 6406] + +* Sat Nov 27 2010 Ian Wells 2.2.0-7.sme +- Correction to allow units in upper and lower case [SME: 5248] + +* Sat Nov 27 2010 Ian Wells 2.2.0-6.sme +- Allow non-integers in Quota [SME: 5248] + +* Sun Nov 21 2010 Ian Wells 2.2.0-5.sme +- SME 8.0 Changelog Cleanup [SME: 6368] + +* Thu Nov 4 2010 Shad L. Lords 2.2.0-4.sme +- Enable quotas on ext4 filesystems as well [SME: 6309] + +* Wed Apr 28 2010 Ian Wells 2.2.0-3.sme +- Improve the HTML formatting of the modify quota panel [SME: 5867] + +* Mon Apr 13 2009 Gavin Weight 2.2.0-2.sme +- Remove unnecessary Mount Proc line. [SME: 4112] + +* 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.10.0-11 +- Add common tags to e-smith-formmagick's general [SME: 4284] + +* Fri Mar 28 2008 Stephen Noble 1.10.0-10 +- Add spacing and localise 'files' [SME: 4133] + +* Wed Feb 13 2008 Stephen Noble 1.10.0-9 +- Remove tags now in general [SME: 3927] + +* Tue Feb 12 2008 chris burnat 1.10.0-8 +- Fix deletion of usernames with one character [SME: 2451] + +* Mon Dec 17 2007 Shad L. Lords 1.10.0-7 +- Enable quotas for all lvm partitions [SME: 3651] + +* Sun Oct 14 2007 Shad L. Lords 1.10.0-6 +- Remove unnecessary build dependency [SME: 3534] + +* Sun Apr 29 2007 Shad L. Lords +- Clean up spec so package can be built by koji/plague + +* Thu Dec 07 2006 Shad L. Lords +- Update to new release naming. No functional changes. +- Make Packager generic + +* Sun Jul 16 2006 Charlie Brady 1.10.0-04 +- Fix sanity checking of hard/soft quota values, and fix "no limit" display + text (fixes thanks to Robert van den Aker). [SME: 1462] + +* Sun Jul 16 2006 Gavin Weight 1.10.0-03 +- Fix quota.pm to allow account names with ".". [SME: 1702] + +* Mon May 01 2006 Charlie Brady 1.10.0-02 +- Fix mis-sorting of users in quota table. [SME: 1346] + +* Thu Mar 16 2006 Gordon Rowell 1.10.0-01 +- Roll stable stream version. [SME: 1016] + +* Wed Nov 30 2005 Gordon Rowell 1.9.2-05 +- Bump release number only + +* Thu Oct 20 2005 Charlie Brady +- [1.9.2-04] +- Add line break to over-quota email message to improve readability. + +* Wed Oct 19 2005 Charlie Brady +- [1.9.2-03] +- Re-fix L10N in over-quota warning messages. [SF: 1312830] + +* Tue Oct 18 2005 Charlie Brady +- [1.9.2-02] +- In warnquota, give Text::Template::fill_in an aliased reference to + $conf, rather than a copy. [SF: 1312772] + +* Fri Oct 14 2005 Gordon Rowell +- [1.9.2-01] +- Remove L10Ns from base packages [SF: 1309520] + +* Fri Oct 14 2005 Gordon Rowell +- [1.9.1-01] +- New dev stream before relocating L10Ns + +* Tue Oct 4 2005 Charlie Brady +- [1.9.0-14] +- Fix L10N in over-quota warning messages. [SF: 1312830] + +* Fri Sep 30 2005 Gordon Rowell +- [1.9.0-13] +- Added Italian L10N - Thanks Filippo Carletti [SF: 1309266] + +* Mon Sep 26 2005 Gordon Rowell +- [1.9.0-12] +- Added German L10N - Thanks Dietmar Berteld [SF: 1293325] + +* Tue Jul 19 2005 Charlie Brady +- [1.9.0-11] +- Update to current db access APIs (patches by Shad and Charlie) [SF: 1216546] + +* Wed Jul 13 2005 Charlie Brady +- [1.9.0-10] +- Add quota setup in fstab templates (moved from e-smith-base). + +* Mon Jun 27 2005 Charlie Brady +- [1.9.0-09] +- Really fix permissions of /etc/cron.d/warnquota. [SF: 1226700] + +* Fri Jun 24 2005 Charlie Brady +- [1.9.0-08] +- Make perms of /etc/cron.d/warnquota acceptible to latest crond. + [SF: 1226700] + +* Thu Mar 17 2005 Charlie Brady +- [1.9.0-07] +- Fix some perl anachronisms which elicit warnings. [MN00075093] + +* Thu Mar 10 2005 Charlie Brady +- [1.9.0-06] +- Update success and error messages to use new convention + (patch submitted by Shad Lords). + +* Wed Dec 29 2004 Charlie Brady +- [1.9.0-05] +- Remount / with quota support before trying to create quota + files. [MN00061221] + +* Fri Dec 24 2004 Charlie Brady +- [1.9.0-04] +- Fix rc.quota_create's check for existing quota file, and add + convertquota calls, in case of old style quota files. + [MN00061221] + +* Thu Dec 16 2004 Charlie Brady +- [1.9.0-03] +- Run /etc/rc.d/rc.quota_create before rc.sysinit, to enable + filesystem quota support. [charlieb MN00061221] + +* Wed Nov 10 2004 Charlie Brady +- [1.9.0-02] +- Untaint acct before using in system(). [charlieb MN00050161] + +* Wed Nov 10 2004 Charlie Brady +- [1.9.0-01] +- Changing version to development stream number - 1.9.0 + +* Thu Jun 26 2003 Charlie Brady +- [1.8.0-01] +- Changing version to stable stream number - 1.8.0 + +* Tue Jun 24 2003 Gordon Rowell +- [1.7.0-22] +- Spanish nav bar [gordonr 9153] + +* Fri May 30 2003 Mark Knox +- [1.7.0-21] +- Whoops. Don't need /usr/lib/e-smith-quota anymore. Removed [markk 8847] + +* Fri May 30 2003 Mark Knox +- [1.7.0-20] +- Create template output dir in %build, and fragments need Locale::gettext + [markk 8847] + +* Fri May 30 2003 Charlie Brady +- [1.7.0-19] +- Move fstab fragment into e-smith-base. [charlieb 8868] + +* Tue May 6 2003 Lijie Deng +- [1.7.0-18] +- Add Spanish lexicon for quota [lijied 3793] + +* Thu Apr 17 2003 Lijie Deng +- [1.7.0-17] +- Standardize the Add/Remove/Save button name [lijied 7921] + +* Thu Apr 10 2003 Lijie Deng +- [1.7.0-16] +- Change $q->table back [lijied 8034] + +* Fri Apr 4 2003 Lijie Deng +- [1.7.0-15] +- Change $q->table to $q->start_table where necessary [lijied 8034] + +* Thu Apr 3 2003 Lijie Deng +- [1.7.0-14] +- Removed SME Server branding [lijied 8016] + +* Fri Mar 28 2003 Lijie Deng +- [1.7.0-13] +- Modified /po/fr_CA to fr [lijied 6787] + +* Fri Mar 28 2003 Lijie Deng +- [1.7.0-12] +- Modified French lexicon to use lang="fr", rename the lexicon + directory to fr [lijied 6787] + +* Mon Mar 10 2003 Lijie Deng +- [1.7.0-11] +- Modified charset tag in .po file [lijied 3930] + +* Fri Mar 7 2003 Lijie Deng +- [1.7.0-10] +- Modified en-us and fr-ca panel title + modified en-us and fr-ca nav bar label [lijied 7356] +- Modified e-smith-devtools version [lijied 7578] + +* Thu Mar 6 2003 Lijie Deng +- [1.7.0-09] +- Modified quotas panel order [lijied 7356] +- Added French .po file to po/fr_CA, and modified the + %build in spec file [lijied 7442] + +* Tue Mar 4 2003 Lijie Deng +- [1.7.0-08] +- Split en-us lexicon from quota panel [lijied 4030] + +* Mon Mar 3 2003 Lijie Deng +- [1.7.0-07] +- Added French lexicon for quota. [lijied 5003] + +* Sat Jan 25 2003 Mike Dickson +- [1.7.0-06] +- added ACTION to the lexicon [miked 6363] + +* Wed Jan 1 2003 Gordon Rowell +- [1.7.0-05] +- Rewrote templates to use esmith::I18N [gordonr 5212] + +* Fri Dec 27 2002 Mike Dickson +- [1.7.0-04] +- minor UI update [miked 5494] + +* Mon Dec 9 2002 Mike Dickson +- [1.7.0-03] +- updates for new UI [miked 5494] + +* Thu Nov 21 2002 Mike Dickson +- [1.7.0-02] +- update to new UI system [miked 5494] + +* Wed Nov 20 2002 Mike Dickson +- [1.7.0-01] +- Changing to development stream; version upped to 1.7.0 + +* Wed Oct 16 2002 Gordon Rowell +- [1.6.1-03] +- Don't suppress quota warnings if hard limit is zero [gordonr 5230] + +* Tue Oct 15 2002 Charlie Brady +- [1.6.1-02] +- Fix I18N of From header in warning emails. Quote "full name" + part of From header (to be sure). [charlieb 5205] + +* Tue Oct 15 2002 Charlie Brady +- [1.6.1-01] +- Fix use of comma as string concat operator in overquota mail message + templates. Break some long lines while we are at it. [charlieb 5178] + +* Fri Oct 11 2002 Charlie Brady +- [1.6.0-01] +- Roll to maintained version number to 1.6.0 + +* Fri Oct 11 2002 Mark Knox +- [1.5.3-03] +- Improved unit suffix handling to more closely correspond to docs [markk 5102] +- Allow "unlimited" hard quota with soft quota [markk 5102] + +* Tue Oct 8 2002 Mark Knox +- [1.5.3-02] +- Improved error strings [markk 5102] + +* Wed Sep 25 2002 Mark Knox +- [1.5.3-01] +- Rolled version to clean up patch errors + +* Wed Sep 25 2002 Mark Knox +- [1.5.2-04] +- Clean up panel display and instructions [markk 4475] + +* Wed Sep 4 2002 Mark Knox +- [1.5.2-03] +- Disambiguated the explanation of how disk usage is calculated. [markk 4473] + +* Tue Aug 27 2002 Mark Knox +- [1.5.2-02] +- Display decimal values in summary screen [markk 4475] +- Allow entry of KB, MB, or GB values in modify panel [markk 4475] +- Choose and display "best" unit in modify panel [markk 4475] + +* Thu Aug 8 2002 Charlie Brady +- [1.5.2-01] +- Remove dangling enable-quota symlinks. [charlieb 4297] + +* Mon Aug 5 2002 Charlie Brady +- [1.5.1-01] +- Bump quota requirement to version 3. +- Fix fstab template to handle ext3 file systems. [charlieb 4297] +- Remove action script which runs quotacheck - this is now done by rc.sysinit + during reboot. [charlieb 4297] + +* Wed Jun 5 2002 Charlie Brady +- [1.5.0-01] +- Changing version to development stream number to 1.5.0 + +* Fri May 31 2002 Charlie Brady +- [1.4.0-01] +- Changing version to maintained stream number to 1.4.0 + +* Thu May 23 2002 Gordon Rowell +- [1.3.9-01] +- RPM rebuild forced by cvsroot2rpm + +* Sat May 18 2002 Gordon Rowell +- [1.3.8-01] +- Move enable-quota back into post-{install,upgrade}. Skip the quotacheck + if the quota files exist. For an install, they won't. For an upgrade + from a previously quota'ed system, they will and we don't want to + bother checking the whole filesystem during the upgrade. For an upgrade + from a pre-quota system they won't exist, so we need to check. + Note: /etc/fstab must have the quota options enabled before we attempt + to run quotacheck or it exits silently [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.7-01] +- Turn quotas on (well, off then on) after enabling quotas in case + we didn't enable them at boot time in an upgrade from version which + didn't have quotas [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.6-01] +- Re-add enable-quotas to post-install, after expansion of /etc/fstab + [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.5-01] +- Updated e-smith-base dependency [gordonr 3439] + +* Sat May 18 2002 Gordon Rowell +- [1.3.4-01] +- Relocated the scaffolding for /etc/fstab templates to e-smith-base, + leaving the enable quotas fragment here. The template is also expanded + with an action in e-smith-base. Updated e-smith-base Requires [gordonr 3439] + +* Mon May 13 2002 Gordon Rowell +- [1.3.3-01] +- Really fix createlinks [gordonr 3439] + +* Mon May 13 2002 Gordon Rowell +- [1.3.2-01] +- Actually run enable-quotas in bootstrap-console-save and fix + createlinks [gordonr 3439] + +* Mon May 13 2002 Gordon Rowell +- [1.3.1-01] +- Moving to stream 1.3.1 (1.3.0 skipped by accidentally) +- Check all quotas during bootstrap-console-save rather than + post-upgrade so that the install completes quickly, even on + a machine with lots of disk to check. [gordonr 3439] + +* Wed May 8 2002 Gordon Rowell +- [1.2.8-01] +- Subst scanmail.tmpl -> template name in both quota templates [markk 3029] +- Need to enable quotas before trying to restore them :-) [gordonr 2730] + +* Wed May 8 2002 Mark Knox +- [1.2.7-01] +- Added gettext in quota warning templates [markk 3029] + +* Tue May 7 2002 Gordon Rowell +- [1.2.6-01] +- Localised "Modify" link on main page [markk 3317] + +* Wed May 1 2002 Gordon Rowell +- [1.2.5-01] +- esmith::AccountDB -> esmith::AccountsDB [schwern 3287] + +* Wed Apr 24 2002 Gordon Rowell +- [1.2.4-01] +- Rewording SOFT/HARD errors for consistency [gordonr 3027] + +* Mon Apr 22 2002 Adrian Chung +- [1.2.3-01] +- Pass the $user object instead of the $username variable in user-modify-quota. + +* Tue Apr 16 2002 Mark Knox +- [1.2.2-01] +- Added a missing button in the modify user page [markk 3159] + +* Mon Apr 15 2002 Mark Knox +- [1.2.1-01] +- Adding warning for Quota::query failure to warnquota & user-modify-quota + [schwern 2730] +- Testing user-modify-quota [schwern 2729 2730] +- Converted to FormMagick panel and internationalized. Added some POD and + tests. [markk 3159] +- Added buildtests in %build [markk 3159] + +* Thu Mar 7 2002 Charlie Brady +- [1.2.0-01] +- rollRPM: Rolled version number too 1.2.0-01. Includes patches up to 1.0.0-02. +- DO NOT MAKE ANY FURTHER CHANGES TO THIS FILE, as this is the base version + being imported into CVS. + +* Fri Feb 01 2002 Charlie Brady +- [1.0.0-02] +- Allow hard and soft quota to be equal. This also allows the quota to be + removed. See #2729. +- Set quota limits for all users in post-upgrade event. This allows for + a system restore to have properly set up quotas. + +* Tue Dec 11 2001 Jason Miller +- [1.0.0-01] +- rollRPM: Rolled version number to 1.0.0-01. Includes patches up to 0.1.1-09. + +* Wed Dec 5 2001 Adrian Chung +- [0.1.1-09] +- Adding new warnquota script that sends mail to users who have exceeded their + "limit with grace time", and a summary report to admin. +- Adding admin summary template, and user quota warning template to + /etc/e-smith/templates/usr/lib/e-smith-quota + +* Wed Dec 5 2001 Adrian Chung +- [0.1.1-08] +- Adding check in panel to make sure that soft limit + is less than hard limit. +- Also insert missing subroutine prototype. + +* Thu Nov 15 2001 Adrian Chung +- [0.1.1-07] +- More text changes to the quota panel. +- Changed kB sizing output to mB sizing. +- Still no genSmallRedCellRightJustified. Yet. + +* Wed Nov 14 2001 Charlie Brady +- [0.1.1-06] +- Add daily quota warning script. For now, just use a wrapper for + /usr/sbin/warnquota. In time we will write our own script in perl + and produce a customised report. + +* Wed Nov 14 2001 Adrian Chung +- [0.1.1-05] +- Update createlinks to create manager quota panel link +- More text changes to quota panel. +- Use genSmallCellRightJustified +- Create "Modify" button. + +* Wed Nov 14 2001 Adrian Chung +- [0.1.1-04] +- Add some wording to panel, and change wording of + soft and hard limits to "limit with grace time" and + "immediate limit" +- Still to roll in genSmallCellRight + +* Tue Nov 13 2001 Charlie Brady +- [0.1.1-03] +- Add bare bones web panel which allows setting of soft and hard file limits. + +* Mon Nov 12 2001 Charlie Brady +- [0.1.1-02] +- Add action script to set and modify quotas using properties from the accounts + db. + +* Fri Nov 09 2001 Charlie Brady +- Initial + +%prep +%setup + +%build +mkdir -p root/etc/e-smith/events/post-{install,upgrade} +mkdir -p root/etc/e-smith/events/user-{create,modify} +mkdir -p root/etc/e-smith/web/panels/manager/cgi-bin + +xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.tmpl.po \ + root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl -L perl +xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.tmpl.po \ + root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl -L perl + +perl createlinks +/sbin/e-smith/buildtests 50-e-smith-quota + +/sbin/e-smith/generate-lexicons + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) +rm -f %{name}-%{version}-%{release}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --file /etc/rc.d/rc.quota_create 'attr(0755,root,root)' \ + --file /etc/cron.d/warnquota 'attr(0644,root,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/cron.d/warnquota b/root/etc/cron.d/warnquota new file mode 100644 index 0000000..67bbcbd --- /dev/null +++ b/root/etc/cron.d/warnquota @@ -0,0 +1,2 @@ +# Send email reminders about being overquota. Do it daily (at 00:37) +37 0 * * * root /sbin/e-smith/warnquota diff --git a/root/etc/e-smith/events/actions/user-modify-quota b/root/etc/e-smith/events/actions/user-modify-quota new file mode 100644 index 0000000..28ebe91 --- /dev/null +++ b/root/etc/e-smith/events/actions/user-modify-quota @@ -0,0 +1,227 @@ +#!/usr/bin/perl -w + +#---------------------------------------------------------------------- +# copyright (C) 2002 Mitel Networks Corporation +# +# 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 +# +# Technical support for this program is available from Mitel Networks +# Please visit our web site www.mitel.com/sme/ for details. +#---------------------------------------------------------------------- + +package esmith; + +use strict; +use Errno; +use Quota; +use esmith::AccountsDB; + +my $accounts = esmith::AccountsDB->open; + +my @users = (); + +my $event = $ARGV [0]; +if ($event eq "bootstrap-console-save") +{ + # For bootstrap-console-save, make sure that quota entries are + # set for each user + @users = $accounts->users; +} +else +{ + # Otherwise just set quota for the named user. + my $userName = $ARGV [1]; + + #------------------------------------------------------------ + # Check the Unix account + #------------------------------------------------------------ + + +=begin testing + +use esmith::TestUtils qw(simulate_perl_program); +my $exit = simulate_perl_program($Original_File, 'wibble-event', + 'user_that_doesnt_exist'); +is( $exit, 255 * 256, 'non-existent user - exit code' ); +like( $@, qr{^Account "user_that_doesnt_exist" is not a user account}, + ' failure message'); + + +$exit = simulate_perl_program($Original_File, 'wibble-event' ); +is( $exit, 255 * 256, 'forgotten user - exit code' ); +like( $@, qr{^Username argument missing}, + ' failure message'); + +=end testing + +=cut + + die "Username argument missing.\n" unless defined ($userName); + + my $user = $accounts->get($userName); + + if( !$user or $user->prop('type') ne 'user' ) + { + die qq{Account "$userName" is not a user account; modify } . + "user quota failed.\n"; + } + @users = ($user); +} + + +=begin testing + +my $a_tmp = '50-e-smith-quota/accounts.conf'; +$ENV{ESMITH_ACCOUNT_DB} = $a_tmp; + +END { unlink $a_tmp }; + +open(TMP, ">$a_tmp") || die $!; +print TMP <<'OUT'; +root=system|Gid|0|Uid|0 +server-manager=url +server-manual=url +shared=system|Gid|500|Visible|internal +shutdown=system +slocate=system|Gid|21 +user_quota=user|Gid|1000|Uid|1000|MaxBlocksSoftLim|10000|MaxBlocks|20000|MaxFilesSoftLim|1000|MaxFiles|2000 +user_partial=user|Gid|1001|Uid|1001|MaxBlocksSoftLim|123456|MaxFiles|321 +user_no_quota=user|Gid|1002|Uid|1002 +OUT +close TMP; + +# Quota properties in the order setqlim likes. +my @QProps = qw(MaxBlocksSoftLim MaxBlocks MaxFilesSoftLim MaxFiles); +my %curr_quota = ( + 1000 => { MaxFilesSoftLim => 100 }, + 1001 => { MaxBlocks => 30000, MaxBlocksSoftLim => 20000 }, + 1002 => { MaxFiles => 2 }, +); + +# What we expect the new quotas to be +my %expect_quotas = ( + 1000 => { MaxBlocksSoftLim => 10000, MaxBlocks => 20000, + MaxFilesSoftLim => 1000, MaxFiles => 2000 }, + 1001 => { MaxBlocksSoftLim => 123456, MaxBlocks => 30000, + MaxFilesSoftLim => 0, MaxFiles => 321 }, + 1002 => { MaxBlocksSoftLim => 0, MaxBlocks => 0, + MaxFilesSoftLim => 0, MaxFiles => 2 }, +); + + +{ + # Since these users don't really exist, we have to fool getpwnam + # into using the Uid from the dummy accounts DB. + no warnings 'once'; + local *CORE::GLOBAL::getpwnam = sub { + esmith::AccountsDB->open->get($_[0])->prop('Uid'); + }; + + + # Override the Quota query and set functions since + # 1) these users probably don't exist + # 2) if they did, we don't want to screw with their quotas + # 3) we need to know how each Quota function is called + use Quota; + no warnings 'redefine'; + + my %query; + sub Quota::query { + my($dev, $uid, $isgrp) = @_; + $query{$uid} = { isgrp => $isgrp }; + return (0, + $curr_quota{$uid}{MaxBlocksSoftLim} || 0, + $curr_quota{$uid}{MaxBlocks} || 0, + 0, + 0, + $curr_quota{$uid}{MaxFilesSoftLim} || 0, + $curr_quota{$uid}{MaxFiles} || 0, + 0 + ); + } + + my %set_quota = (); + sub Quota::setqlim { + my($dev, $uid) = (shift, shift); + my(@limits) = splice(@_, 0, 4); + my($tlo) = shift; + + my %limits = (); + @limits{@QProps} = @limits; + $set_quota{$uid}{limits} = \%limits; + $set_quota{$uid}{tlo} = $tlo; + + return 1; + } + + $_STDOUT_ = ''; + $_STDERR_ = ''; + my $exit = simulate_perl_program($Original_File, 'bootstrap-console-save'); + is( $exit, 0, 'bootstrap-console-save - exit code' ); + is( $_STDOUT_, '' ); + is( $_STDERR_, '' ); + is( $@, '' ); + + is_deeply( [sort keys %set_quota], [sort qw(1000 1001 1002)] ); + foreach my $uid (keys %set_quota) + { + is_deeply( $set_quota{$uid}{limits}, $expect_quotas{$uid}, + "setqlim for $uid"); + } +} + +=end testing + +=cut + + +# Quota properties in the order setqlim likes. +my @QProps = qw(MaxBlocksSoftLim MaxBlocks MaxFilesSoftLim MaxFiles); + +foreach my $user (@users) +{ + my $userName = $user->key; + my $uid = getpwnam($userName); + die qq{Could not get uid for user named "$userName"\n} unless $uid; + + my(%uquota, %curr_quota); + foreach my $qprop (@QProps) + { + $uquota{$qprop} = $user->prop($qprop); + } + + # Get a $dev value appropriate for use in Quota::query call. + my $dev = Quota::getqcarg("/home/e-smith/files"); + + # Get current quota settings. + @curr_quota{@QProps} = (Quota::query($dev, $uid, 0))[1,2,5,6]; + + if( !defined $curr_quota{MaxBlocks} ) # Quota::query failed + { + warn "Cannot query your quota for '$userName' on '$dev'\n"; + warn "Quota error (are you using NFS?): ", Quota::strerr(), "\n"; + next; + } + + # Keep old values unless there are values defined in the account record + foreach my $qprop (@QProps) + { + $uquota{$qprop} = $curr_quota{$qprop} + unless defined $uquota{$qprop}; + } + + # Set the new quota + Quota::setqlim($dev, $uid, @uquota{@QProps}, 0); +} diff --git a/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota b/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota new file mode 100644 index 0000000..fc3097d --- /dev/null +++ b/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota @@ -0,0 +1,130 @@ + + + FORM_TITLE + Create, modify, or remove user account quotas + + + UNABLE_TO_OPEN_ACCOUNTS + Unable to open accounts db + + + QUOTA_DESC + + You can set filesystem quotas for users on your system by clicking + the "Modify" button next to the user you wish to update. + +

If the user exceeds the "Limit with grace period", warnings will be + generated. If this limit is exceeded for longer than a week or if the + "Absolute limit" is reached, the user will be unable to store any more + files or receive any more e-mail. + +

A setting of '0' for either limit disables that limit for the + corresponding user. + +

The disk space for each user includes the user's home directory, + e-mail, and any files owned by the user in information bays. + ]]> + + + + CURRENT_USAGE_AND_SETTINGS + Current Quota Usage and Settings + + + LIMIT_WITH_GRACE + Limit with grace period + + + LIMIT_WITH_GRACE_MB + Limit with grace period (MB) + + + ABS_LIMIT + Absolute limit + + + ABS_LIMIT_MB + Absolute limit (MB) + + + CURRENT_USAGE + Current usage (MB) + + + COULD_NOT_GET_UID + Could not determine the uid for user: + + + ERR_NO_SUCH_ACCT + Error: there is no account named: + + + ERR_NOT_A_USER_ACCT + Error: the account is not a user account: + + + ACCOUNT_IS_TYPE + It is an account of type: + + + MODIFY_USER_TITLE + Modify user quota limits + + + USER + User: + + + CURRENTLY_HAS + currently has: + + + FILES + files + + + OCCUPYING + occupying: + + + MEGABYTES + megabytes + + + INSTRUCTIONS + + Enter the quota with optional unit suffix of 'K' for kilobytes, 'M' for megabytes, + 'G' for gigabytes or 'T' for terabytes. + Entries with no suffix are assumed to be in megabytes. A setting of '0' + for either limit disables that limit for the corresponding user. + + + + SOFT_VAL_MUST_BE_NUMBER + Error: limit with grace period must be a number, optionally followed by one of the unit suffixes K, M, G, or T. + + + HARD_VAL_MUST_BE_NUMBER + Error: absolute limit must be a number, optionally followed by one of the unit suffixes K, M, G, or T. + + + ERR_HARD_LT_SOFT + + Error: absolute limit must be greater than limit with grace time. + + + + ERR_MODIFYING + Error occurred while modifying user. + + + SUCCESSFULLY_MODIFIED + Successfully modified quota for user account: + + + Quotas + Quotas + + + diff --git a/root/etc/e-smith/templates/etc/fstab/50EnableQuotas b/root/etc/e-smith/templates/etc/fstab/50EnableQuotas new file mode 100644 index 0000000..31ae794 --- /dev/null +++ b/root/etc/e-smith/templates/etc/fstab/50EnableQuotas @@ -0,0 +1,11 @@ +{ + # Change defaults => usrquota,grpquota for / file system + @lines = map { + /\s\/\s+ext[234]\s+defaults\s/ && s/defaults/usrquota,grpquota/; + /^\/dev\/main\/.*\s+ext[234]\s+defaults\s/ && s/defaults/usrquota,grpquota/; + /\s\/\s+xfs\s+defaults\s/ && s/defaults/uquota,gquota/; + /^\/dev\/main\/.*\s+xfs\s+defaults\s/ && s/defaults/uquota,gquota/; + $_ + } @lines; + ""; +} diff --git a/root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl b/root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl new file mode 100644 index 0000000..11eba08 --- /dev/null +++ b/root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl @@ -0,0 +1,44 @@ +{ + use esmith::I18N; + use Locale::gettext; + + my $i18n = new esmith::I18N; + $i18n->setLocale('adminQuotaSummary.tmpl'); + + my $domain = $conf->get_value("DomainName") || "localhost"; + my $systemName = $conf->get_value("SystemName") || "SME Server"; + + $OUT .= "To: ".gettext("System Administrator")." \n"; + $OUT .= "From: \"". + gettext("Automated quota report"). + "\" \n"; + $OUT .= "Subject: ". + gettext("One or more users have exceeded their disk quota"). + "\n"; + + #---------------------------------------------------------------------- + # Over quota users: + #---------------------------------------------------------------------- + + $OUT .= gettext("The following users have exceeded their disk quota on the server called"). + " \"$systemName\" ".gettext("All values are in megabytes."); + $OUT .= "\n"; + + $OUT .= sprintf("%-20s%+8s%+28s%+19s", + gettext("Account"), + gettext("Usage"), + gettext("Limit with grace period"), + gettext("Absolute limit") + ) . "\n"; + $OUT .= "-"x75 . "\n";; + + foreach my $user (sort keys %usersOverQuota) + { + $OUT .= sprintf("%-20s%8.2f%28.2f%19.2f", + $user, + $usersOverQuota{$user}{usage}, + $usersOverQuota{$user}{softQuota}, + $usersOverQuota{$user}{hardQuota} + ) . "\n"; + } +} diff --git a/root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl b/root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl new file mode 100644 index 0000000..6dfa03f --- /dev/null +++ b/root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl @@ -0,0 +1,31 @@ +{ + use esmith::I18N; + use Locale::gettext; + + my $i18n = new esmith::I18N; + $i18n->setLocale('userOverQuota.tmpl'); + + my $domain = $conf->get_value("DomainName") || "localhost"; + my $systemName = $conf->get_value("SystemName") || "SME Server"; + + my $gracePeriodEnds = localtime($data{gracePeriod}); + + $OUT .= "To: $data{fullname} <$data{username}\@${domain}>\n"; + $OUT .= "From: \"". + gettext("Automated quota report"). + "\" \n"; + $OUT .= "Subject: ".gettext("You have exceeded your disk quota")."\n"; + + $OUT .= gettext("Your current disk usage:"). + " $data{usage} ".gettext("Mb")."\n"; + $OUT .= gettext("Your maximum usage:"). + ($data{hardQuota} == 0 ? gettext(" no limit set") : + " $data{hardQuota} ".gettext("Mb"))."\n"; + $OUT .= gettext("Warnings start at:"). + " $data{softQuota} ".gettext("Mb")."\n"; + $OUT .= gettext("Grace period ends:")." $gracePeriodEnds\n"; + $OUT .= gettext("System name:")." $systemName\n\n"; + + $OUT .= gettext("You are currently using more disk space than you have been allotted. You have until the Grace Period above to remove files so that you no longer exceed the warning level. At no time will you be permitted to store more than the maximum usage indicated above. This disk allocation includes all your e-mail, including unread e-mail."); + +} diff --git a/root/etc/e-smith/tests/50-e-smith-quota/.dummy b/root/etc/e-smith/tests/50-e-smith-quota/.dummy new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/web/functions/quota b/root/etc/e-smith/web/functions/quota new file mode 100644 index 0000000..d5e0db4 --- /dev/null +++ b/root/etc/e-smith/web/functions/quota @@ -0,0 +1,49 @@ +#!/usr/bin/perl -wT + +#---------------------------------------------------------------------- +# heading : Collaboration +# description : Quotas +# navigation : 2000 2300 +#---------------------------------------------------------------------- + +#---------------------------------------------------------------------- +# copyright (C) 2002 Mitel Networks Corporation +# +# 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 +# +# Technical support for this program is available from Mitel Networks +# Please visit our web site www.e-smith.com for details. +#---------------------------------------------------------------------- +use strict; +use esmith::FormMagick::Panel::quota; + +my $panel = esmith::FormMagick::Panel::quota->new(); +$panel->display(); + +__DATA__ +

+ + + + + + MODIFY_USER_TITLE + + + + +
diff --git a/root/sbin/e-smith/warnquota b/root/sbin/e-smith/warnquota new file mode 100644 index 0000000..41482da --- /dev/null +++ b/root/sbin/e-smith/warnquota @@ -0,0 +1,294 @@ +#!/usr/bin/perl -w + +package esmith; + +use strict; + +use esmith::ConfigDB; +use esmith::util; +use esmith::db; + +use Text::Template; + +sub getUserQuotas(); +sub alertUsersOverQuota($$); +sub sendAdminSummary($$$$); + +sub toMB ($); +sub toMBNoDecimalPlaces ($); +sub toKB ($); + +my $conf = esmith::ConfigDB->open_ro; + +=for testing +is( system("$^X -cw $Original_File 2>&1"), 0, 'it compiles' ); + + +=head1 Automated quota reporting + +This script iterates through each user account on the system and sends +an email report to each user when they are over quota. + +It sends a combined summary report to the administrator. + +=cut + +#---------------------------------------------------------------------- +# Set qmail environment variables so that we get decent looking mail +# headers (From, Return-Path) +#---------------------------------------------------------------------- + +my $domain = $conf->get_value("DomainName") || 'localhost'; + +my ($quotaOffenders, $quotaUsers, $quotalessUsers) + = getUserQuotas(); + +alertUsersOverQuota($conf, $quotaOffenders); +sendAdminSummary($conf, $quotaOffenders, $quotaUsers, $quotalessUsers); + +=head2 getUserQuotas() + +For each user on the system, determines their current disk usage, soft +and hard quota, and grace period remaining. + +It returns three data structures containing users whom are over quota, +users whom are under quota, and those with no quotas: + +%hash = { + 'user1' => { + 'hardQuota', + 'softQuota', + 'username', + 'usage', + 'fullname', + 'gracePeriod' + }, + + . + . + . + . + + 'userX' => { + 'hardQuota', + 'softQuota', + 'username', + 'usage', + 'fullname', + 'gracePeriod' + } + + + + + }; + +=cut + +sub getUserQuotas() +{ + use Quota; + + use esmith::AccountsDB; + my $adb = esmith::AccountsDB->open_ro(); + + my %usersOverQuota; + my %usersUnderQuota; + my %usersWithNoQuota; + + # Make $dev arg for quota query calls + my $dev = Quota::getqcarg('/home/e-smith/files'); + + #------------------------------------------------------------ + # Loop through all user accounts and collect stats. + #------------------------------------------------------------ + + foreach my $user ($adb->users) + { + my $uid = getpwnam($user->key); + unless ($uid) + { + warn("Could not get uid for user \"" . $user->key ."\""); + next; + } + my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = + Quota::query($dev, $uid); + + if( !defined $bc ) # Quota::query failed + { + warn "Cannot query quota for '" . $user->key . "' on '$dev': ", Quota::strerr(), "\n"; + next; + } + + my $name = $user->prop('FirstName') . " " . $user->prop('LastName'); + + #------------------------------------------------------------ + # Collect user stats if over quota. + # Everyone over quota goes into %usersOverQuota + # Everyone under quota goes into %usersUnderQuota + # Everyone else, goes into %usersWithNoQuota. + #------------------------------------------------------------ + + if ( ($bs == 0) && ($bh == 0) ) + { + # User has no quota + # Add user to data structure. + ${usersWithNoQuota{$user->key}} = { + username => $user->key, + fullname => $name, + usage => toMB($bc), + softQuota => toMB($bs), + hardQuota => toMB($bh), + gracePeriod => $bt + }; + } + elsif ( (($bc > $bh) && ($bh > 0)) || (($bc > $bs) && ($bs > 0)) ) + { + # User is over quota + # gracePeriod is 0 if over hard limit + + # Add user to data structure. + ${usersOverQuota{$user->key}} = { + username => $user->key, + fullname => $name, + usage => toMB($bc), + softQuota => toMB($bs), + hardQuota => toMB($bh), + gracePeriod => $bt + }; + } + else + { + # User is within quota + # Add user to data structure. + ${usersUnderQuota{$user->key}} = { + username => $user->key, + fullname => $name, + usage => toMB($bc), + softQuota => toMB($bs), + hardQuota => toMB($bh), + gracePeriod => $bt + }; + } + } + + return \%usersOverQuota, \%usersUnderQuota, \%usersWithNoQuota; + +} + +=head2 alertUsersOverQuota($) + +This function iterates through all users who are over quota (contained +in data structure above), and sends email to each one. + +It doesn't bother sending mail to those users who have exceeded their +hard quota, since they probably won't be able to receive e-mail, unless +there's either a delegate mail server defined, or their mail spool is +elsewhere. + +=cut + +sub alertUsersOverQuota($$) +{ + my ($conf, $usersOverQuota) = @_; + + return unless keys %$usersOverQuota; + + foreach my $user (keys %$usersOverQuota) + { + #------------------------------------------------------------------ + # Don't send email to users who are over their hard quota + # They likely won't be able to receive it. + # Plus, they've already had 7 days of warnings. + #------------------------------------------------------------------ + + next if ( ($usersOverQuota->{$user}{usage} + > $usersOverQuota->{$user}{hardQuota}) and + ($usersOverQuota->{$user}{hardQuota} != 0) ); + + my $templates = '/etc/e-smith/templates'; + my $source = '/usr/lib/e-smith-quota/userOverQuota.tmpl'; + + # Use templates-custom version by preference if it exists + -f "${templates}-custom${source}" and $templates .= "-custom"; + + my $t = new Text::Template(TYPE => 'FILE', + SOURCE => "${templates}${source}"); + + open(QMAIL, "|/var/qmail/bin/qmail-inject -fdo-not-reply\@$domain $user") + || die "Could not send mail via qmail-inject!\n"; + + print QMAIL $t->fill_in( HASH => { + conf => \$conf, + data => $usersOverQuota->{$user} + }); + + close QMAIL; + } +} + +=head2 + +sendAdminSummary($$$$) + +Generates an email summary of users and their quota statuses. It takes +as arguments a reference to a tied configuration database hash, and +three data structures (format above) containing: + + - users over quota + - users under quota + - users without quotas. + +At the moment, it only emails those users who are over quota to the +administrator. + +=cut + +sub sendAdminSummary($$$$) +{ + my ($conf, $usersOverQuota, $usersUnderQuota, $usersWithNoQuota) = @_; + + return unless keys %$usersOverQuota; + + my $templates = '/etc/e-smith/templates'; + my $source = '/usr/lib/e-smith-quota/adminQuotaSummary.tmpl'; + + # Use templates-custom version by preference if it exists + -f "${templates}-custom${source}" and $templates .= "-custom"; + + my $t = new Text::Template(TYPE => 'FILE', + SOURCE => "${templates}${source}"); + + open(QMAIL, "|/var/qmail/bin/qmail-inject -fdo-not-reply\@$domain admin") + || die "Could not send mail via qmail-inject!\n"; + + print QMAIL $t->fill_in( HASH => { + conf => \$conf, + usersOverQuota => $usersOverQuota, + usersUnderQuota => $usersUnderQuota + }); + + close QMAIL; + +} + +=head2 + +toMB($) + +Takes a number as input, and output the number divided by 1024, but also +formatted to two decimal places. + +A helper function to convert kilobytes to megabytes. + +=cut + +#---------------------------------------------------------------------- +# Helper function to convert kilobytes to megabytes. +#---------------------------------------------------------------------- + +sub toMB ($) +{ + my ($kb) = @_; + return sprintf("%.2f", $kb / 1024); +} diff --git a/root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.po b/root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.po new file mode 100644 index 0000000..505d770 --- /dev/null +++ b/root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.po @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2002-05-08 13:01-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:16 +msgid "System Administrator" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:17 +msgid "SME Server automated quota report" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:18 +msgid "One or more users have exceeded their disk quota" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:24 +msgid "The following users have exceeded their disk quota on the server called" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:24 +msgid "All values are in megabytes." +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:27 +msgid "Account" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:28 +msgid "Usage" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:29 +msgid "Limit with grace period" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:30 +msgid "Absolute limit" +msgstr "" diff --git a/root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.po b/root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.po new file mode 100644 index 0000000..28c6516 --- /dev/null +++ b/root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.po @@ -0,0 +1,58 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2002-05-08 13:01-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:19 +msgid "SME Server automated quota report" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:20 +msgid "You have exceeded your disk quota" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:22 +msgid "Your current disk usage:" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:22 +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:23 +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:24 +msgid "Mb" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:23 +msgid "Your maximum usage:" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:24 +msgid "Warnings start at:" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:25 +msgid "Grace period ends:" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:26 +msgid "System name:" +msgstr "" + +#: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:28 +msgid "" +"You are currently using more disk space than you have been allotted. You " +"have until the Grace Period above to remove files so that you no longer " +"exceed the warning level. At no time will you be permitted to store more " +"than the maximum usage indicated above. This disk allocation includes all " +"your e-mail, including unread e-mail." +msgstr "" diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/quota.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/quota.pm new file mode 100644 index 0000000..a23dcd7 --- /dev/null +++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/quota.pm @@ -0,0 +1,412 @@ +#!/usr/bin/perl -w +# +# Copyright (C) 2002 Mitel Networks Corporation +# +# Technical support for this program is available from e-smith, inc. +# Please call us at (613) 236-0743 or visit our web site www.e-smith.net +# for details. +# +# $Id: quota.pm,v 1.14 2004/11/10 15:50:05 charlieb Exp $ +# +#---------------------------------------------------------------------- + + +package esmith::FormMagick::Panel::quota; + +use strict; +use Exporter; +use Quota; +use esmith::AccountsDB; +use esmith::FormMagick; +use esmith::cgi; +use esmith::TestUtils; +use Scalar::Util qw(looks_like_number); + +our @ISA = qw(esmith::FormMagick Exporter); +our @EXPORT = qw( + showInitial modifyUser performModifyUser +); +our $VERSION = sprintf '%d.%03d', q$Revision: 1.14 $ =~ /: (\d+).(\d+)/; + +=pod + +=head1 NAME + +esmith::FormMagick::Panel::quota - useful panel functions + +=head1 SYNOPSIS + + use esmith::FormMagick::Panel::quota; + my $panel = esmith::FormMagick::Panel::quota->new(); + $panel->display(); + +=head1 DESCRIPTION + +=head2 new + +Exactly as for esmith::FormMagick + +=begin testing + +use_ok('esmith::FormMagick::Panel::quota'); +$FM = esmith::FormMagick::Panel::quota->new(); +isa_ok($FM, 'esmith::FormMagick::Panel::quota'); +$FM->{cgi} = CGI->new; + +=end testing + +=cut + +sub new +{ + shift; + my $self = esmith::FormMagick->new(); + $self->{calling_package} = (caller)[0]; + bless $self; + return $self; +} + +=pod + +=head2 showInitial + +Display the contents of the initial page + +=for testing +is($FM->showInitial(), '', 'showInitial'); + +=cut + +sub showInitial +{ + my $self = shift; + my $q = $self->{cgi}; + + #------------------------------------------------------------ + # Look up accounts and user names + #------------------------------------------------------------ + + print ''; + my $adb = esmith::AccountsDB->open() + || die $self->localise("UNABLE_TO_OPEN_ACCOUNTS"); + + my @userAccounts = $adb->users; + + unless (scalar @userAccounts) + { + print $q->h3 ($self->localise('ACCOUNT_USER_NONE')); + } + else + { + print $q->p ($self->localise('QUOTA_DESC')),"\n"; + print $q->h3 ($self->localise('CURRENT_USAGE_AND_SETTINGS')),"\n"; + #print $q->p ($q->b ($self->localise('CURRENT_USAGE_AND_SETTINGS'))); + print $q->Tr ($q->start_table({class => "sme-border"})),"\n"; + my $limit = $self->localise('LIMIT_WITH_GRACE_MB'); $limit =~ s#(grace)#
$1#; + my $absolute = $self->localise('ABS_LIMIT_MB'); $absolute =~ s#(limit)#
$1#; + my $current = $self->localise('CURRENT_USAGE'); $current =~ s#(usage)#
$1#; + print $q->Tr (esmith::cgi::genSmallCell ($q, ($self->localise('ACCOUNT')),"header"), + esmith::cgi::genSmallCell ($q, ($self->localise('USER_NAME')),"header"), + esmith::cgi::genSmallCell ($q, $limit,"header"), + esmith::cgi::genSmallCell ($q, $absolute,"header"), + esmith::cgi::genSmallCell ($q, $current,"header"), + esmith::cgi::genSmallCell ($q, ($self->localise('ACTION')),"header")); + + foreach my $user (@userAccounts) + { + my $uid = getpwnam($user->key); + unless ($uid) + { + warn($self->localise('COULD_NOT_GET_UID'),$user->key); + next; + } + my $dev = Quota::getqcarg('/home/e-smith/files'); + my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = + Quota::query($dev, $uid); + + my $name = $user->prop("FirstName")." ".$user->prop("LastName"); + + print $q->Tr (esmith::cgi::genSmallCell ($q, $user->key,"normal"), + esmith::cgi::genSmallCell ($q, $name,"normal"), + esmith::cgi::genSmallCellRightJustified ($q, + $self->toMB($bs)), + esmith::cgi::genSmallCellRightJustified ($q, + $self->toMB($bh)), + esmith::cgi::genSmallCellRightJustified ($q, $self->toMB($bc)), + esmith::cgi::genSmallCell ($q, + $q->a ({href => $q->url (-absolute => 1) + . "?page=0&Next=Next&acct=" + . $user->key}, + $self->localise("MODIFY")),"normal")); + } + print ''; + } + print ''; + return ''; +} + +=pod + +=head2 modifyUser + +Display the modify user form for the specified user + +=begin testing + +$FM->{cgi}->param(-name=>'acct', -value=>'foononex'); +is($FM->modifyUser(),'','modifyUser'); + +=end testing + +=cut + +sub modifyUser +{ + my $self = shift; + my $q = $self->{cgi}; + my $msg; + + my $adb = esmith::AccountsDB->open(); + my $acct = $q->param ('acct'); + my $rec = $adb->get($acct); + unless (defined $rec) + { + $msg = $self->localise('ERR_NO_SUCH_ACCT').$acct; + return $self->error($msg, 'Initial'); + } + my $type = $rec->prop('type'); + unless ($type eq "user") + { + $msg = $self->localise('ERR_NOT_A_USER_ACCT').$acct.$self->localise('ACCOUNT_IS_TYPE').$type; + return $self->error($msg, 'Initial'); + } + my $uid = getpwnam($acct); + unless ($uid) + { + $msg = $self->localise('COULD_NOT_GET_UID').$acct; + return $self->error($msg, 'Initial'); + } + + my $name = $rec->prop("FirstName")." ".$rec->prop("LastName"); + my $dev = Quota::getqcarg('/home/e-smith/files'); + my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = + Quota::query($dev, $uid); + print ''; + + print + $q->p($self->localise('USER')." $name (\"$acct\") ". + $self->localise('CURRENTLY_HAS')." $ic ". + $self->localise('FILES')." ". + $self->localise('OCCUPYING')." ". $self->toMB($bc) ." ". + $self->localise('MEGABYTES')); + + print + $q->p($self->localise('INSTRUCTIONS')); + + print $q->table ({border => 0, cellspacing => 0, cellpadding => 4}, + + $q->Tr (esmith::cgi::genCell ($q, $self->localise("USER_NAME")), + esmith::cgi::genCell ($q, $name)), + $q->Tr (esmith::cgi::genCell ($q, $self->localise('LIMIT_WITH_GRACE')), + esmith::cgi::genCell ($q, + $q->textfield (-name => 'soft', + -override => 1, + -default => $self->toBestUnit($bs), + -size => 12))), + $q->Tr (esmith::cgi::genCell ($q, $self->localise('ABS_LIMIT')), + esmith::cgi::genCell ($q, + $q->textfield (-name => 'hard', + -override => 1, + -default => $self->toBestUnit($bh), + -size => 12)))); + print ''; + return ''; +} + + +=pod + +=head2 performModifyUser + +Perform the modifications requested by the Modify page + +=begin testing + +$FM->{cgi}->param(-name=>'acct', -value=>'fooquuxb'); +is($FM->performModifyUser(),'','performModifyUser'); + +=end testing + +=cut + +sub performModifyUser +{ + my $self = shift; + my $q = $self->{cgi}; + my $msg; + + my $adb = esmith::AccountsDB->open(); + my $acct = $q->param ('acct'); + + my $rec = $adb->get($acct); + unless (defined $rec) + { + $msg = $self->localise('ERR_NO_SUCH_ACCT').$acct; + return $self->error($msg, 'Initial'); + } + my $type = $rec->prop('type'); + unless ($type eq "user") + { + $msg = $self->localise('ERR_NOT_A_USER_ACCT').$acct.$self->localise('ACCOUNT_IS_TYPE').$type; + return $self->error($msg, 'Initial'); + } + my $uid = getpwnam($acct); + unless ($uid) + { + $msg = $self->localise('COULD_NOT_GET_UID').$acct; + return $self->error($msg, 'Initial'); + } + my $softlim = $q->param ('soft'); + + if (($softlim !~ /^(.+?)\s*([KMGT])?$/ ) || (!looks_like_number ($1))) + { + return $self->error('SOFT_VAL_MUST_BE_NUMBER', 'Initial'); + } + my $exponent = 1; # Entries with no suffix are assumed to be in megabytes. + if (defined ($2)) + { + $exponent = index("KMGT",$2); + } + $softlim = ($1 * 1024 ** $exponent); + + my $hardlim = $q->param ('hard'); + if (($hardlim !~ /^(.+?)\s*([KMGT])?$/ ) || (!looks_like_number ($1))) + { + return $self->error('HARD_VAL_MUST_BE_NUMBER', 'Initial'); + } + $exponent = 1; # Entries with no suffix are assumed to be in megabytes. + if (defined ($2)) + { + $exponent = index("KMGT",$2); + } + $hardlim = ($1 * 1024 ** $exponent); + + #------------------------------------------------------------ + # Make sure that soft limit is less than hard limit. + #------------------------------------------------------------ + + unless ($hardlim == 0 or $hardlim > $softlim) + { + return $self->error('ERR_HARD_LT_SOFT', 'Initial'); + } + + + #------------------------------------------------------------ + # Update accounts database and signal the user-modify event. + #------------------------------------------------------------ + + $rec->set_prop('MaxBlocks', $hardlim); + $rec->set_prop('MaxBlocksSoftLim', $softlim); + + # Untaint $acct before using in system(). + $acct =~ /^(\w[\-\w_\.]*)$/; $acct = $1; + system ("/sbin/e-smith/signal-event", "user-modify", "$acct") == 0 + or die ($self->localise('ERR_MODIFYING')."\n"); + + $msg = $self->localise('SUCCESSFULLY_MODIFIED').$acct; + return $self->success($msg, 'Initial'); +} + +=pod + +=head2 toMB ($kb) + +Utility function to convert KB to MB + +=for testing +is($FM->toMB(1024),'1.00','toMB'); + +=cut + +sub toMB +{ + my ($self,$kb) = @_; + return sprintf("%.2f", $kb / 1024); +} + +=pod + +=head2 toMBNoDecimalPlaces ($kb) + +Utility function to convert KB to MB with no decimal places + +=for testing +is($FM->toMBNoDecimalPlaces(2050), '2', 'toMBNoDecimalPlaces'); + +=cut + +sub toMBNoDecimalPlaces +{ + my ($self,$kb) = @_; + return sprintf("%.0f", $kb / 1024); +} + +sub toGBNoDecimalPlaces +{ + my ($self,$kb) = @_; + return sprintf("%.0f", $kb / 1024 / 1024); +} + + +=pod + +=head2 toKB ($mb) + +Utility function to convert MB to KB. + +=for testing +is($FM->toKB(4),'4096','toKB'); + +=cut + +sub toKB +{ + my ($self,$mb) = @_; + return sprintf("%.0f", $mb * 1024); +} + +=pod + +Utility to convert GB to KB + +=for testing +is($FM->GBtoKB(1),1048576,'GBtoKB'); + +=cut + +sub GBtoKB +{ + my ($self,$gb) = @_; + return sprintf("%.0f", $gb * 1024 * 1024); +} + +sub MBtoKB +{ + my ($self,$mb) = @_; + return sprintf("%.0f", $mb * 1024); +} + +sub toBestUnit +{ + my ($self,$kb) = @_; + return 0 if($kb == 0); + return $kb."K" if($kb < 1024); + return $kb."K" if($kb > 1024 && $kb < 1048576 && $kb % 1024 != 0); + return $self->toMBNoDecimalPlaces($kb)."M" if($kb < 1048576); + return $self->toMBNoDecimalPlaces($kb)."M" if($kb > 1048576 + && ($kb % 1048576 != 0)); + return $self->toGBNoDecimalPlaces($kb)."G"; +} + +1; +