From fde633a74143ccdebb934c0403bdbe45f433969f Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 6 Sep 2015 20:52:36 +0200 Subject: sarg - code style cleanup and fixes sarg_schedule.xml - Fix copyright header - Nuke unused custom_php_(de)install_command - Nuke some nonsensical extra menu under Diagnostics - Fix file permissions - Code style and indentation fixes - Make descriptions readable and improve English. --- config/sarg/sarg_schedule.xml | 165 ++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 85 deletions(-) (limited to 'config/sarg') diff --git a/config/sarg/sarg_schedule.xml b/config/sarg/sarg_schedule.xml index 5123d786..7bc02d10 100644 --- a/config/sarg/sarg_schedule.xml +++ b/config/sarg/sarg_schedule.xml @@ -1,65 +1,50 @@ - - + + - - + - - Describe your package here - Describe your package requirements here - Currently there are no FAQ items provided. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ +/* ====================================================================================== */ + ]]> + sargschedule - 0.5 + 0.6.5 Status: Sarg Schedules /usr/local/pkg/sarg.inc - - /usr/local/pkg/ - 0755 - https://packages.pfsense.org/packages/config/sarg/sarg.inc - - - /usr/local/pkg/ - 0755 - https://packages.pfsense.org/packages/config/sarg/sarg_sync.xml - - - sarg - sarg -
Diagnostics
- sarg.xml - General @@ -101,7 +86,7 @@ frequency - Aditional Args + Additional Args args @@ -116,7 +101,7 @@ Description description - arrow + on @@ -128,48 +113,58 @@ Enable enable checkbox - Enable this schedule - + Enable this schedule. + Description description - Enter a description for this file. + Enter a description for this schedule. input 50 - Sarg args + Sarg Args args - - To force sarg to create a report only for specific days, use:
- TODAY:  -d `date +%d/%m/%Y`
- YESTERDAY:  -d `date -v-1d +%d/%m/%Y`
- WEEKAGO:  -d `date -v-1w +%d/%m/%Y`-`date -v-1d +%d/%m/%Y`
- MONTHAGO:  -d `date -v-1m +01/%m/%Y`-`date -v-1m +31/%m/%Y`]]> + + + To force Sarg to create a report only for specific days, use:

+ TODAY:  -d `date +%d/%m/%Y`
+ YESTERDAY:  -d `date -v-1d +%d/%m/%Y`
+ WEEKAGO:  -d `date -v-1w +%d/%m/%Y`-`date -v-1d +%d/%m/%Y`
+ MONTHAGO:  -d `date -v-1m +01/%m/%Y`-`date -v-1m +31/%m/%Y` + ]]> + input 50 - frequency + Frequency frequency input 5 - - Valid options are minutes(m), hours(h), days(d)
- Sample: To update every hour, use 1h

]]><input type="submit" name="Submit" value="Force update now"><br> + + + Valid options are: minutes(m), hours(h), days(d)
+ Example: To update every hour, use 1h

+
+ ]]> + - Action after sarg + Action After Sarg action + Choose an action to run after Sarg finishes. select - - - + + + - - Choose an action after sarg finishes + + none listtopic @@ -179,14 +174,14 @@ Enable Compression gzip - + Enable this option to compress Sarg HTML report files using gzip. Reduces reports size. checkbox - Compression level + Compression Level gziplevel select - + @@ -197,7 +192,7 @@ - + Choose gzip compression level. @@ -206,21 +201,21 @@ input 60 5 - - Default is to 60 minutes. If your reports take longer to be created, increase this value.]]> + + + If your reports take long time to be created, increase this value.
+ Default: 60 (minutes). + ]]> + - - sarg_php_install_command(); - - - sarg_validate_input($_POST, $input_errors); sync_package_sarg(); - + sarg_resync(); -- cgit v1.2.3