diff options
Diffstat (limited to 'config/sarg')
| -rw-r--r-- | config/sarg/sarg.xml | 24 | ||||
| -rwxr-xr-x | config/sarg/sarg_about.php | 10 | ||||
| -rwxr-xr-x | config/sarg/sarg_frame.php | 2 | ||||
| -rwxr-xr-x | config/sarg/sarg_realtime.php | 6 | ||||
| -rwxr-xr-x | config/sarg/sarg_reports.php | 6 | ||||
| -rw-r--r-- | config/sarg/sarg_schedule.xml | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/config/sarg/sarg.xml b/config/sarg/sarg.xml index cc11cad4..a0162e3b 100644 --- a/config/sarg/sarg.xml +++ b/config/sarg/sarg.xml @@ -53,62 +53,62 @@ <url>/pkg_edit.php?xml=sarg.xml</url> </menu> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg.inc</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg.inc</item> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_schedule.xml</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_schedule.xml</item> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_sync.xml</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_sync.xml</item> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_users.xml</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_users.xml</item> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_realtime.php</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_realtime.php</item> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_about.php</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_about.php</item> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg.php</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg.php</item> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_reports.php</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_reports.php</item> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_frame.php</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_frame.php</item> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg_sorttable.js</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_sorttable.js</item> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg.template</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg.template</item> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/sarg/sarg.priv.inc</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg.priv.inc</item> <prefix>/etc/inc/priv/</prefix> <chmod>0755</chmod> </additional_files_needed> diff --git a/config/sarg/sarg_about.php b/config/sarg/sarg_about.php index 1321adf6..573dc5ee 100755 --- a/config/sarg/sarg_about.php +++ b/config/sarg/sarg_about.php @@ -1,7 +1,7 @@ <?php /* sarg_about.php - part of pfSense (http://www.pfsense.com/) + part of pfSense (https://www.pfsense.org/) Copyright (C) 2012 Marcello Coutinho <marcellocoutinho@gmail.com> All rights reserved. @@ -29,8 +29,8 @@ require("guiconfig.inc"); -$pfSversion = str_replace("\n", "", file_get_contents("/etc/version")); -if(strstr($pfSversion, "1.2")) +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); +if ($pf_version < 2.0) $one_two = true; $pgtitle = "About: Sarg Package"; @@ -80,11 +80,11 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Credits ");?></td> - <td width="78%" class="vtable"><?=gettext("Package Created by <a target=_new href='http://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a><br><br>");?></td> + <td width="78%" class="vtable"><?=gettext("Package Created by <a target=_new href='https://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a><br><br>");?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Donatios ");?></td> - <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br><br> + <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='https://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br><br> If you want that your donation goes to this package developer, make a note on donation forwarding it to me.<br><br>");?></td> </tr> </table> diff --git a/config/sarg/sarg_frame.php b/config/sarg/sarg_frame.php index 21638247..6f3c941e 100755 --- a/config/sarg/sarg_frame.php +++ b/config/sarg/sarg_frame.php @@ -1,7 +1,7 @@ <?php /* sarg_frame.php - part of pfSense (http://www.pfsense.com/) + part of pfSense (https://www.pfsense.org/) Copyright (C) 2012 Marcello Coutinho <marcellocoutinho@gmail.com> based on varnish_view_config. All rights reserved. diff --git a/config/sarg/sarg_realtime.php b/config/sarg/sarg_realtime.php index 76e89769..81ea0a79 100755 --- a/config/sarg/sarg_realtime.php +++ b/config/sarg/sarg_realtime.php @@ -1,7 +1,7 @@ <?php /* sarg_realtime.php - part of pfSense (http://www.pfsense.com/) + part of pfSense (https://www.pfsense.org/) Copyright (C) 2012 Marcello Coutinho <marcellocoutinho@gmail.com> All rights reserved. @@ -99,8 +99,8 @@ if ($_REQUEST['cmd']!=""){ } else{ require("guiconfig.inc"); - $pfSversion = str_replace("\n", "", file_get_contents("/etc/version")); - if(strstr($pfSversion, "1.2")) + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pf_version < 2.0) $one_two = true; $pgtitle = "Status: Sarg Realtime"; diff --git a/config/sarg/sarg_reports.php b/config/sarg/sarg_reports.php index b156a4d7..f18eb80e 100755 --- a/config/sarg/sarg_reports.php +++ b/config/sarg/sarg_reports.php @@ -1,7 +1,7 @@ <?php /* sarg_reports.php - part of pfSense (http://www.pfsense.com/) + part of pfSense (https://www.pfsense.org/) Copyright (C) 2012 Marcello Coutinho <marcellocoutinho@gmail.com> All rights reserved. @@ -29,8 +29,8 @@ require("guiconfig.inc"); - $pfSversion = str_replace("\n", "", file_get_contents("/etc/version")); - if(strstr($pfSversion, "1.2")) + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pf_version < 2.0) $one_two = true; $pgtitle = "Status: Sarg Reports"; diff --git a/config/sarg/sarg_schedule.xml b/config/sarg/sarg_schedule.xml index 9e1ad709..07e24d5c 100644 --- a/config/sarg/sarg_schedule.xml +++ b/config/sarg/sarg_schedule.xml @@ -47,12 +47,12 @@ <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/sarg/sarg.inc</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg.inc</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/sarg/sarg_sync.xml</item> + <item>https://packages.pfsense.org/packages/config/sarg/sarg_sync.xml</item> </additional_files_needed> <menu> <name>sarg</name> |