diff options
67 files changed, 3137 insertions, 154 deletions
diff --git a/config/bandwidthd/bandwidthd.inc b/config/bandwidthd/bandwidthd.inc index b7ef3bbd..ac5cc116 100644 --- a/config/bandwidthd/bandwidthd.inc +++ b/config/bandwidthd/bandwidthd.inc @@ -31,18 +31,17 @@ // Check pfSense version $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); switch ($pfs_version) { - case "1.2": - case "2.0": - define('PKG_BANDWIDTHD_BASE', '/usr/local/bandwidthd'); - define('PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV', ''); - break; case "2.1": define('PKG_BANDWIDTHD_BASE', '/usr/pbi/bandwidthd-' . php_uname("m") . '/bandwidthd'); define('PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV', ''); break; - default: + case "2.2": define('PKG_BANDWIDTHD_BASE', '/usr/pbi/bandwidthd-' . php_uname("m") . '/local/bandwidthd'); define('PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV', 'LD_LIBRARY_PATH=/usr/pbi/bandwidthd-' . php_uname("m") . '/local/lib'); + break; + default: + define('PKG_BANDWIDTHD_BASE', '/usr/local/bandwidthd'); + define('PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV', ''); } // End: Check pfSense version diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 00076816..76da6213 100644 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -48,15 +48,18 @@ require_once("services.inc"); // Check pfSense version $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); -define('FREERADIUS_BASE', '/usr/pbi/freeradius-' . php_uname("m")); +if ($pfs_version == "2.1" || $pfs_version == "2.2") + define('FREERADIUS_BASE', '/usr/pbi/freeradius-' . php_uname("m")); +else + define('FREERADIUS_BASE', '/usr/local'); $bash_path = FREERADIUS_BASE . "/bin/bash"; -if ($pfs_version == "2.1") { - define('FREERADIUS_LIB', FREERADIUS_BASE . '/lib'); - define('FREERADIUS_ETC', FREERADIUS_BASE . '/etc'); -} else { +if ($pfs_version == "2.2") { define('FREERADIUS_LIB', FREERADIUS_BASE . '/local/lib'); define('FREERADIUS_ETC', FREERADIUS_BASE . '/local/etc'); +} else { + define('FREERADIUS_LIB', FREERADIUS_BASE . '/lib'); + define('FREERADIUS_ETC', FREERADIUS_BASE . '/etc'); } // Check freeradius lib version @@ -65,11 +68,11 @@ if ($pfs_version == "2.1") { $libfiles = scandir(FREERADIUS_LIB); foreach ($libfiles as $libfile){ if (preg_match("/freeradius-/",$libfile)) - $frlib=FREERADIUS_BASE . "/lib/{$libfile}"; + $frlib=FREERADIUS_LIB . '/' . $libfile; } } if ($frlib == ""){ - log_error("freeRADIUS - No freeradius lib found on ".FREERADIUS_BASE."/lib"); + log_error("freeRADIUS - No freeradius lib found on ".FREERADIUS_LIB); } function freeradius_deinstall_command() { @@ -92,7 +95,9 @@ function freeradius_install_command() { @symlink(FREERADIUS_ETC . "/raddb", "/usr/local/etc/raddb"); if (!file_exists("/var/log/radutmp")) { exec("touch /var/log/radutmp"); } if (!file_exists("/var/log/radwtmp")) { exec("touch /var/log/radwtmp"); } - exec("chown -R root:wheel " . FREERADIUS_ETC . "/raddb && chown -R root:wheel {$frlib} && chown -R root:wheel /var/log/radacct"); + exec("chown -R root:wheel " . FREERADIUS_ETC . "/raddb /var/log/radacct"); + if (file_exists($frlib)) + exec("chown -R root:wheel {$frlib}"); // creating a backup file of the original policy.conf no matter if user checked this or not if (!file_exists(FREERADIUS_ETC . "/raddb/policy.conf.backup")) { diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml index 8cef9430..16a4875c 100644 --- a/config/freeradius2/freeradius.xml +++ b/config/freeradius2/freeradius.xml @@ -45,7 +45,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>freeradius</name> - <version>2.2.0</version> + <version>1.6.12</version> <title>FreeRADIUS: Users</title> <include_file>/usr/local/pkg/freeradius.inc</include_file> <menu> diff --git a/config/freeradius2/freeradius_view_config.php b/config/freeradius2/freeradius_view_config.php index b2959783..0095b009 100644 --- a/config/freeradius2/freeradius_view_config.php +++ b/config/freeradius2/freeradius_view_config.php @@ -33,10 +33,13 @@ require("guiconfig.inc"); // Check to find out on which system the package is running -if (substr(trim(file_get_contents("/etc/version")),0,3) == "2.1") { +$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); +if ($pfs_version == "2.1") { define('RADDB', '/usr/pbi/freeradius-' . php_uname("m") . '/etc/raddb'); -} else { +} else if ($pfs_version == "2.1") { define('RADDB', '/usr/pbi/freeradius-' . php_uname("m") . '/local/etc/raddb'); +} else { + define('RADDB', '/usr/local/etc/raddb'); } // End of system check diff --git a/config/imspector/imspector.inc b/config/imspector/imspector.inc index 89fbda2b..7853e627 100644 --- a/config/imspector/imspector.inc +++ b/config/imspector/imspector.inc @@ -35,8 +35,12 @@ require_once("service-utils.inc"); /* IMSpector */ + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pf_version == "2.1" || $pf_version == "2.2") + define('IMSPECTOR_ETC', "/usr/pbi/imspector-" . php_uname("m") . "/local/etc/imspector"); + else + define('IMSPECTOR_ETC', "/usr/local/etc/imspector"); define('IMSPECTOR_RCFILE', '/usr/local/etc/rc.d/imspector.sh'); - define('IMSPECTOR_ETC', "/usr/pbi/imspector-" . php_uname("m") . "/local/etc/imspector"); define('IMSPECTOR_CONFIG', IMSPECTOR_ETC . '/imspector.conf'); function imspector_warn ($msg) { syslog(LOG_WARNING, "imspector: {$msg}"); } @@ -542,4 +546,4 @@ function imspector_do_xmlrpc_sync($sync_to_ip, $password) { } } -?>
\ No newline at end of file +?> diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index fed2e7dc..ebe3cc57 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -33,7 +33,7 @@ /* LCDproc */ define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh'); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) { + if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf'); } else { define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc index 321328bc..d4b4856a 100644 --- a/config/lcdproc/lcdproc.inc +++ b/config/lcdproc/lcdproc.inc @@ -34,7 +34,7 @@ define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh'); define('LCDPROC_CLIENT', '/tmp/lcdclient.sh'); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) { + if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf'); } else { define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc index 054713a1..503e9cf3 100644 --- a/config/lightsquid/lightsquid.inc +++ b/config/lightsquid/lightsquid.inc @@ -41,15 +41,15 @@ else update_log("File 'squid.inc' not found."); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); switch ($pfs_version) { - case "1.2": - case "2.0": - define('LIGHTSQUID_BASE','/usr/local'); - break; case "2.1": define('LIGHTSQUID_BASE', '/usr/pbi/lightsquid-' . php_uname("m")); break; - default: + case "2.2": define('LIGHTSQUID_BASE', '/usr/pbi/lightsquid-' . php_uname("m") . '/local'); + break; + default: + define('LIGHTSQUID_BASE','/usr/local'); + break; } define ('CMD_PKGDELETE', 'pkg_delete lightsquid-1.7.1'); @@ -63,7 +63,7 @@ define('LS_CONFIGPATH', LIGHTSQUID_BASE . '/etc/lightsquid'); define('LS_CONFIGFILE', 'lightsquid.cfg'); define('LS_CONFIGFILE_DIST', 'lightsquid.cfg.dist'); define('LS_WWWPATH', LIGHTSQUID_BASE . '/www/lightsquid'); -define('LS_TEMPLATEPATH', LIGHTSQUID_BASE . '/www/lightsquid/tpl'); +define('LS_TEMPLATEPATH', '/usr/local/www/lightsquid/tpl'); define('LS_LANGPATH', LIGHTSQUID_BASE . '/share/lightsquid/lang'); define('LS_REPORTPATH', '/var/lightsquid/report'); @@ -115,6 +115,8 @@ define('LS_XML_SHEDULERTIME', 'lightsquid_refreshsheduler_time'); define('LS_XML_SQUID_SHEDULERTIME', 'lightsquid_squidrotatelog_sheduler_time'); function lightsquid_install() { + global $pfs_version; + update_log("lightsquid_install: started"); // create lightsquid report catalog @@ -123,34 +125,29 @@ function lightsquid_install() { mwexec("/bin/mkdir -p " . LS_REPORTPATH); } - // install templates - $lstpl_file = "/var/tmp/lightsquid_tpl.tbz"; - if (file_exists($lstpl_file)) { - mwexec("/usr/bin/tar zxvf $lstpl_file -C " . LS_TEMPLATEPATH); - update_log("lightsquid_install: Install templates from $lstpl_file"); - } - - # check perl - $perl_path = '/usr/bin/perl'; + if ($pfs_version == "2.1" || $pfs_version == "2.2") { + # check perl + $perl_path = '/usr/bin/perl'; - /* Clean up a bad perl link. */ - ls_cleanup_bad_link($perl_path); + /* Clean up a bad perl link. */ + ls_cleanup_bad_link($perl_path); - if (!file_exists("/usr/bin/perl")) { - if (is_executable('/usr/local/bin/perl')) { - symlink('/usr/local/bin/perl', '/usr/bin/perl'); - } elseif (is_executable(LIGHTSQUID_BASE . '/bin/perl')) { - symlink(LIGHTSQUID_BASE . '/bin/perl', '/usr/bin/perl'); + if (!file_exists("/usr/bin/perl")) { + if (is_executable('/usr/local/bin/perl')) { + symlink('/usr/local/bin/perl', '/usr/bin/perl'); + } elseif (is_executable(LIGHTSQUID_BASE . '/bin/perl')) { + symlink(LIGHTSQUID_BASE . '/bin/perl', '/usr/bin/perl'); + } + } + if (!is_dir('/usr/local/lib/perl5') && is_dir(LIGHTSQUID_BASE . '/lib/perl5')) { + symlink(LIGHTSQUID_BASE . '/lib/perl5', '/usr/local/lib/perl5'); + } + if (!is_dir('/usr/local/etc/lightsquid') && is_dir(LS_CONFIGPATH)) { + symlink(LS_CONFIGPATH, '/usr/local/etc/lightsquid'); + } + if (!is_dir('/usr/local/www/lightsquid') && is_dir(LS_WWWPATH)) { + symlink(LS_WWWPATH, '/usr/local/www/lightsquid'); } - } - if (!is_dir('/usr/local/lib/perl5') && is_dir(LIGHTSQUID_BASE . '/lib/perl5')) { - symlink(LIGHTSQUID_BASE . '/lib/perl5', '/usr/local/lib/perl5'); - } - if (!is_dir('/usr/local/etc/lightsquid') && is_dir(LS_CONFIGPATH)) { - symlink(LS_CONFIGPATH, '/usr/local/etc/lightsquid'); - } - if (!is_dir('/usr/local/www/lightsquid') && is_dir(LS_WWWPATH)) { - symlink(LS_WWWPATH, '/usr/local/www/lightsquid'); } update_log("lightsquid_install: stopped"); @@ -167,16 +164,18 @@ function lightsquid_deinstall() { } function lightsquid_resync() { - global $config; + global $config, $pfs_version; $tm = ''; $tm_squid = ''; - # check perl - if (!file_exists("/usr/bin/perl")) - mwexec("ln -s /usr/local/bin/perl /usr/bin/perl"); + if ($pfs_version == "2.1" || $pfs_version == "2.2") { + # check perl + if (!file_exists("/usr/bin/perl")) + mwexec("ln -s /usr/local/bin/perl /usr/bin/perl"); - // Fixup library path so GD can find its libraries for graphs. - mwexec("/sbin/ldconfig -m " . LIGHTSQUID_BASE . "/lib/"); + // Fixup library path so GD can find its libraries for graphs. + mwexec("/sbin/ldconfig -m " . LIGHTSQUID_BASE . "/lib/"); + } // create lightsquid report catalog if (!file_exists(LS_REPORTPATH)) { @@ -193,7 +192,9 @@ function lightsquid_resync() { // variables for update $lsconf_var[LS_VAR_CFGPATH] = "\"" . LS_CONFIGPATH . "\""; - $lsconf_var[LS_VAR_LOGPATH] = "\"" . LS_SQUIDLOGPATH . "\""; + if (isset($config['installedpackages']['squid']['config'][0])) { + $lsconf_var[LS_VAR_LOGPATH] = "\"" . LS_SQUIDLOGPATH . "\""; + } $lsconf_var[LS_VAR_TPLPATH] = "\"" . LS_TEMPLATEPATH . "\""; $lsconf_var[LS_VAR_LANGPATH] = "\"" . LS_LANGPATH . "\""; $lsconf_var[LS_VAR_REPORTPATH] = "\"" . LS_REPORTPATH . "\""; @@ -438,14 +439,16 @@ function refresh_full() { update_log("refresh_full: execute command '$cmd'"); mwexec_bg("$cmd $log_name"); // parse access.log.x - for ($i=0; $i<100; $i++) { - $lg = LS_SQUIDLOG . ".$i"; - if (file_exists(LS_SQUIDLOGPATH . "/$lg")) { - update_log("refresh_full: execute command '$cmd $lg'"); - mwexec_bg("$cmd $lg"); - } else - // really go <= 10 cycles - break; + if (isset($config['installedpackages']['squid']['config'][0])) { + for ($i=0; $i<100; $i++) { + $lg = LS_SQUIDLOG . ".$i"; + if (file_exists(LS_SQUIDLOGPATH . "/$lg")) { + update_log("refresh_full: execute command '$cmd $lg'"); + mwexec_bg("$cmd $lg"); + } else + // really go <= 10 cycles + break; + } } update_log("refresh_full: stop"); } @@ -471,4 +474,4 @@ function ls_cleanup_bad_link($link) { } } -?>
\ No newline at end of file +?> diff --git a/config/lightsquid/lightsquid.xml b/config/lightsquid/lightsquid.xml index 63eaabe4..19ba4512 100644 --- a/config/lightsquid/lightsquid.xml +++ b/config/lightsquid/lightsquid.xml @@ -46,7 +46,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>lightsquid</name> - <version>1.8.2 pkg v.2.35</version> + <version>2.39</version> <title>Services: Proxy Reports (LightSquid, SQStat) -> Settings</title> <category>Status</category> <include_file>/usr/local/pkg/lightsquid.inc</include_file> @@ -77,11 +77,6 @@ <item>https://packages.pfsense.org/packages/config/lightsquid/lightsquid.inc</item> </additional_files_needed> <additional_files_needed> - <prefix>/var/tmp/</prefix> - <chmod>0755</chmod> - <item>https://files.pfsense.org/packages/All/lightsquid_tpl.tbz</item> - </additional_files_needed> - <additional_files_needed> <prefix>/usr/local/www/sqstat/</prefix> <chmod>0644</chmod> <item>https://packages.pfsense.org/packages/config/lightsquid/sqstat.class.php</item> @@ -101,6 +96,196 @@ <chmod>0644</chmod> <item>https://packages.pfsense.org/packages/config/lightsquid/zhabascript.js</item> </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/bigfiles.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/day_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/graph.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/group_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/datetime.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/flag_red.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/graph.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/groups.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/printer.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/users.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/index.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/month_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/print.css</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/screen.css</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/topsites.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_month.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_time.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novopf/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/whousesite.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/bigfiles.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/day_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/graph.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/group_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/datetime.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/flag_red.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/graph.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/groups.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/printer.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/images/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/users.png</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/index.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/month_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/print.css</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/screen.css</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/topsites.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_detail.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_month.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_time.html</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/lightsquid/tpl/novosea/</prefix> + <chmod>0444</chmod> + <item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/whousesite.html</item> + </additional_files_needed> <fields> <field> <fielddescr>Language</fielddescr> diff --git a/config/lightsquid/tpl/novopf/bigfiles.html b/config/lightsquid/tpl/novopf/bigfiles.html new file mode 100755 index 00000000..138d4181 --- /dev/null +++ b/config/lightsquid/tpl/novopf/bigfiles.html @@ -0,0 +1,72 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Big Files Report</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body background="" bgcolor="white" text="black"> + <center> + <table class=title> + <tbody> + <TR class=title> + <TH><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></TH> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </TR> + <tr> + <th colspan="2" align="center"><h2>##MSG_BIG_FILE_DOWNLOAD_REPORT##</h2></th> + </tr> + <tr> + <th colspan="2" align="center"><h3>##MSG_DATE##: ##DATE##</h3></th> + </tr> +<!-- HIDE reportuser start--> + <tr> + <th colspan="2" align="center"><h3>##MSG_USER##: ##REPORTUSER##</h3></th> + </tr> +<!-- HIDE reportuser end--> + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class=stat1> + <th>##MSG_NUM##</th> + <th>##MSG_TIME##</th> + <th>##MSG_USER##</th> + <th>##MSG_SIZE##</th> + <th>##MSG_URL##</th> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + <!-- VARIABLE total bgcolor="E5EFF4" --> + +<!-- [[ bigfile start--> + <tr ##ROWATTR##> + <td align="left" >##BFILENUM##</td> + <td align="left" >##BFILETIME##</td> + <td align="left" ><A HREF="##BFILEUSER_L##">##BFILEUSER_B##</A></td> + <td align="right" nowrap="true">##BFILESIZE##</td> + <td align="right" >##BFILELINK##</td> + </tr> +<!-- ]] bigfile end--> + + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novopf/day_detail.html b/config/lightsquid/tpl/novopf/day_detail.html new file mode 100755 index 00000000..6c432ba0 --- /dev/null +++ b/config/lightsquid/tpl/novopf/day_detail.html @@ -0,0 +1,108 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Day detail</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <!-- Title --> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2"><h2>##MSG_DATE##: <b>##DATE## </h2></td> + </tr> + <tr> + <td colspan="2"><h3><A HREF="##TOPSITESURL_L##">##TOPSITESURL_B##</A> ##MSG_REPORT##</h3></td> + </tr> + <tr> + <td colspan="2"><h3><A HREF="##BIGFILESURL_L##">##BIGFILESURL_B##</A> ##MSG_REPORT##</h3></td> + </tr> + + <!-- Statistic data --> + <tr> + <td colspan="2"> + <table width=100% class=stat> + <tbody> + <!-- HIDE overuser start--> + <tr> + <td colspan="11">##OVERMSG##</td> + </tr> + <!-- HIDE overuser end--> + + <tr class=stat1> + <th>##MSG_NUM##</th> + <!-- HIDE timereport start--> + <th>##MSG_TIME_REPORT##</th> + <!-- HIDE timereport end--> + <th>##MSG_USER##</th> + <!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> + <!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <!-- HIDE putpost start--> + <th>##MSG_PUTPOST##</th> + <!-- HIDE putpost end--> + <th>##MSG_BYTES##</th> + <th>%</th> + <!-- HIDE group start --> + <th>##MSG_GROUP##</th> + <!-- HIDE group end --> + </tr> + + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + + <!-- VARIABLE !putpostnormalattr color="black" --> + <!-- VARIABLE !putpostwarningattr color="red" --> + + <!-- VARIABLE putpostnormalattr </> --> + <!-- VARIABLE putpostwarningattr <img src="get.cgi?png=flag_red" border="0" title="Graph Report"> --> + + <!-- [[ user start--> + <tr ##ROWATTR##> + <td align="right">##USERNUM##</td> + <!-- HIDE timereport start--> + <td align="center"><A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A></td> + <!-- HIDE timereport end--> + <td align="left"><A HREF="##USERURL_L##">##USERURL_B##</A></td> + <!-- HIDE realname start--> + <td align="left" nowrap="true">##REALNAME##</td> + <!-- HIDE realname end--> + <td align="right" nowrap="true">##USERCONNECT##</td> + <!-- HIDE putpost start--> + <td align="right" nowrap="true">##USERPUTPOST####OVERPUTPOSTATTR##</td> + <!-- HIDE putpost end--> + <td align="right" nowrap="true">##USERBYTES##</td> + <td align="right">##USERPERCENT##%</td> + <!-- HIDE group start --> + <td align="left"><a HREF="##USERGROUPURL_L##">##USERGROUPURL_B##</a></td> + <!-- HIDE group end --> + </tr> + <!-- ]] user end--> + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novopf/graph.html b/config/lightsquid/tpl/novopf/graph.html new file mode 100755 index 00000000..4490f4d3 --- /dev/null +++ b/config/lightsquid/tpl/novopf/graph.html @@ -0,0 +1,54 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Graphics</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class="title"> + <tbody> + <tr class=title> + <th align="center"><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_WORK_PERIOD##: ##WORKPERIOD##</h3></td> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MODE##</h3></td> + </tr> + <tr> + <td colspan="2"> + <img src="##GRAPHICSURL##" border="0" title="Graphics" usemap="#bars"> + <map name="bars"> +<!-- [[ imagemap start--> + <area href="##MAPURL##" shape="rect" coords="##MAPCOORD##"> +<!-- ]] imagemap end--> + </map> + </td> + </tr> + <tr> + <td colspan="2"> +<!-- HIDE warning start --> + <center>##MSG_WARNING##, ##MSG_RECOMENDATION## $##VARNAME##=##VARVALUE##*(1024*1024*1024);</center> +<!-- HIDE warning end --> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novopf/group_detail.html b/config/lightsquid/tpl/novopf/group_detail.html new file mode 100755 index 00000000..79b62db3 --- /dev/null +++ b/config/lightsquid/tpl/novopf/group_detail.html @@ -0,0 +1,134 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Day detail - Group Mode</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th align="center"><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_DATE##: ##DATE## </h3></td> + </tr> +<!-- HIDE dayinfo start--> + <tr> + <td colspan="2"><A HREF="##TOPSITESURL_L##">##TOPSITESURL_B##</A><h3>##MSG_REPORT##</h3></td> + </tr> + <tr> + <td colspan="2"><A HREF="##BIGFILESURL_L##">##BIGFILESURL_B##</A><h3>##MSG_REPORT##</h3></td> + </tr> +<!-- HIDE dayinfo end --> + </tbody> + </table> + </center> + + <center> + <table> + <tbody> + <tr> + <td> + <table width="100%" class=stat> + <tbody> + <tr width="100%" class=stat1> + <th>##MSG_NUM##</th> +<!-- HIDE timereport start--> + <th>##MSG_TIME_REPORT##</th> +<!-- HIDE timereport end--> + <th>##MSG_USER##</th> +<!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> +<!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <th>##MSG_BYTES##</th> + <th>%</th> + </tr> + +<!-- [[ groupstart start--> + <tr> + <td colspan="7"><A name="##GROUPSTARTURL_L##">##GROUPSTARTURL_B##</A></td> + </tr> +<!-- ]] groupstart end--> + +<!-- VARIABLE oddattr bgcolor="white" --> +<!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + +<!-- [[ user start--> + <tr ##ROWATTR##> + <td>##USERNUM##</td> +<!-- HIDE timereport start--> + <td><A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A></td> +<!-- HIDE timereport end--> + <td><A HREF="##USERURL_L##">##USERURL_B##</A></td> +<!-- HIDE realname start--> + <td align="right" nowrap="true">##REALNAME##</td> +<!-- HIDE realname end--> + <td align="right">##USERCONNECT##</td> + <td align="right">##USERBYTES##</td> + <td align="right">##USERPERCENT##%</td> + </tr> +<!-- ]] user end--> + +<!-- [[ groupend start--> + <tr> + <td colspan="3"></td> +<!-- HIDE timereport start--> + <td></td> +<!-- HIDE timereport end--> +<!-- HIDE realname start--> + <td></td> +<!-- HIDE realname end--> + <td align="right">##GROUPENDBYTES##</td> + <td align="right">##GROUPENDPERCENT##%</td> + </tr> +<!-- ]] groupend end--> + + </tbody> + </table> + </td> + + <!-- Rigth Column --> + <td style="width: 20%; vertical-align: top; text-align: center;"> + <table width="100%" class=sites> + <tbody> + <tr> + <th class=sites align="right">##MSG_NUM##</th> + <th class=sites>##MSG_GROUP##</th> + <th class=sites align="right">##MSG_BYTES##</th> + <th class=sites align="right">%</th> + </tr> + +<!-- [[ grouplist start--> + <tr ##GROUPROWATTR##> + <td class=sites border="0" align="right">##GROUPLISTNUM##</td> + <td class=sites><A HREF="##GROUPLISTNAMEURL_L##">##GROUPLISTNAMEURL_B##</A></td> + <td class=sites align="right">##GROUPLISTBYTES##</td> + <td class=sites align="right">##GROUPLISTPERCENT##</td> + </tr> +<!-- ]] grouplist end--> + + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> + </body> +</html> diff --git a/config/lightsquid/tpl/novopf/images/datetime.png b/config/lightsquid/tpl/novopf/images/datetime.png Binary files differnew file mode 100755 index 00000000..e2672c20 --- /dev/null +++ b/config/lightsquid/tpl/novopf/images/datetime.png diff --git a/config/lightsquid/tpl/novopf/images/flag_red.png b/config/lightsquid/tpl/novopf/images/flag_red.png Binary files differnew file mode 100755 index 00000000..e8a602da --- /dev/null +++ b/config/lightsquid/tpl/novopf/images/flag_red.png diff --git a/config/lightsquid/tpl/novopf/images/graph.png b/config/lightsquid/tpl/novopf/images/graph.png Binary files differnew file mode 100755 index 00000000..9051fbc6 --- /dev/null +++ b/config/lightsquid/tpl/novopf/images/graph.png diff --git a/config/lightsquid/tpl/novopf/images/groups.png b/config/lightsquid/tpl/novopf/images/groups.png Binary files differnew file mode 100755 index 00000000..d2cfc00d --- /dev/null +++ b/config/lightsquid/tpl/novopf/images/groups.png diff --git a/config/lightsquid/tpl/novopf/images/printer.png b/config/lightsquid/tpl/novopf/images/printer.png Binary files differnew file mode 100755 index 00000000..a350d187 --- /dev/null +++ b/config/lightsquid/tpl/novopf/images/printer.png diff --git a/config/lightsquid/tpl/novopf/images/users.png b/config/lightsquid/tpl/novopf/images/users.png Binary files differnew file mode 100755 index 00000000..e2e2f36a --- /dev/null +++ b/config/lightsquid/tpl/novopf/images/users.png diff --git a/config/lightsquid/tpl/novopf/index.html b/config/lightsquid/tpl/novopf/index.html new file mode 100755 index 00000000..5680866c --- /dev/null +++ b/config/lightsquid/tpl/novopf/index.html @@ -0,0 +1,164 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> + +<HTML> +<HEAD> + <META name="robots" content="noindex,nofollow"> + <META name="generator" content="LightSquid - http://lightsquid.sf.net"> + <META http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <TITLE>LightSquid :: Index</TITLE> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</HEAD> + +<BODY> + <CENTER> + <!-- Title --> + <TABLE class=title> + <TBODY> + <TR class=title> + <TH><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></TH> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </TR> + <TR> + <TD colspan="2"><h2>##MSG_WORK_PERIOD##: ##WORKPERIOD##</h2></TD> + </TR> + + <TR> + <TD align="center" colspan="2"> + <!-- Calendar --> + <TABLE class=calendar> + <TBODY> + <TR class=calendar> + <TH colspan="12">##MSG_CALENDAR##</TH> + </TR> + <TR> + <!-- VARIABLE yearselected bgcolor="#BBCCEE" --> + <!-- [[ year start--> + <TD colspan="##YEARCOLSPAN##" ##YEARSELECTED##> + <a href="##YEARURL_L##">##YEARURL_B##</a><br> + </TD> + <!-- ]] year end--> + </TR> + <TR> + <!-- VARIABLE monthselected bgcolor="#BBCCEE" --> + <!-- [[ month start--> + <TD ##MONTHSELECTED##><a href="##MONTHURL_L##">##MONTHURL_B##</a></TD> + <!-- ]] month end--> + </TR> + </TBODY> + </TABLE> + </TD> + </TR> + + <!-- Statistic data --> + <TR><TD></TD></TR> + <TR><TD> + <TABLE width="100%" class=stat> + <TBODY> + <TR class=stat1> + <TH>##MSG_DATE##</TH> + <!-- HIDE group start --> + <TH>##MSG_GROUP##</TH> + <!-- HIDE group end --> + <TH>##MSG_USERS##</TH> + <!-- HIDE oversize start --> + <TH>##MSG_OVERSIZE##</TH> + <!-- HIDE oversize end --> + <TH>##MSG_BYTES##</TH> + <TH>##MSG_AVERAGE##</TH> + <TH>##MSG_HIT%##</TH> + </TR> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + <!-- VARIABLE sundayattr bgcolor="beige" --> + <!-- VARIABLE saturdayattr bgcolor="#F0EFC7" --> + + <!-- [[ day start--> + <TR ##DAYATTR##> + <TD align="center"><A HREF="##DAYDATE_L##">##DAYDATE_B##</A></TD> + <!-- HIDE group start --> + <TD align="center"><A HREF="##DAYGROUP_L##">##DAYGROUP_B##</A></TD> + <!-- HIDE group end --> + <TD align="center">##DAYUSERS##</TD> + + <!-- HIDE oversize start--> + <TD align="center"><A HREF="##DAYOVERUSERS_L##">##DAYOVERUSERS_B##</A></TD> + <!-- HIDE oversize end--> + <TD align="right" nowrap="true">##DAYBYTES##</TD> + <TD align="right">##DAYAVERAGE##</TD> + <TD align="right">##DAYCACHEHIT##%</TD> + </TR> + <!-- ]] day end--> + + <!-- Summary --> + <TR class=total> + <TD align="left">##MSG_TOTAL_AVERAGE##:</Td> + <!-- HIDE group start --> + <TD> </TD> + <!-- HIDE group end --> + <TD align="center">##USERAVERAGE##</TD> + <!-- HIDE oversize start--> + <TD align="center">##OVERUSERAVERAGE##</TD> + <!-- HIDE oversize end --> + <TD align="right"><A HREF="##TOTAL_L##">##TOTAL_B##</A></TD> + <TD align="right">##TOTALAVERAGE##</TD> + <TD align="right">##AVERAGEHIT##%</TD> + </TR> + </TBODY> + </TABLE> + </TD> + + <TD style="width: 20%; vertical-align: top; text-align: center;"> + <!-- Popular sites --> + <TABLE width="100%" class="sites"> + <TBODY> + <TR> + <TH colspan="2" class="sites">##MSG_TOP_SITES##</TH> + </TR> + <TR> + <TD class="sites"><A HREF="##TOP_YEAR_L##">##TOP_YEAR_B##</A></TD> + <!-- HIDE monthtop start --> + <TD class="sites"><A HREF="##TOP_MONTH_L##">##TOP_MONTH_B##</A></TD> + </TR> + + <TR> + <TH colspan="2" class="sites">##MSG_TOTAL##</TH> + </TR> + <TR> + <TD class="sites"><A HREF="##TOTAL_YEAR_L##">##TOTAL_YEAR_B##</A></TD> + <TD nowrap="nowrap" class="sites"> + <A HREF="##TOTAL_MONTH_L##">##TOTAL_MONTH_B##</A> + <!-- HIDE graph start --> + <A HREF="##MONTH_GRAPH_L##"><img src="get.cgi?png=graph" border="0" title="Graph Report"></A> + <!-- HIDE graph end --> + </TD> + </TR> + + <TR> + <TH colspan="2" class="sites">##MSG_GROUP##</TH> + </TR> + <TR> + <TD class="sites"><A HREF="##GROUP_YEAR_L##">##GROUP_YEAR_B##</A></TD> + <TD class="sites"><A HREF="##GROUP_MONTH_L##">##GROUP_MONTH_B##</TD> + <!-- HIDE monthtop end --> + </TR> + </TBODY> + </TABLE> + </TD> + </TR> + + <!-- Footer --> + <TR><TD></TD></TR> + <TR> + <TD colspan="2"> + ##COPYRIGHT## + </TD> + </TR> + </TBODY> + </TABLE> + </CENTER> +</BODY> +</HTML> diff --git a/config/lightsquid/tpl/novopf/month_detail.html b/config/lightsquid/tpl/novopf/month_detail.html new file mode 100755 index 00000000..ec637367 --- /dev/null +++ b/config/lightsquid/tpl/novopf/month_detail.html @@ -0,0 +1,95 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Whole Month User Report</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class="title"> + <tbody> + <tr class="title"> + <th align="center"><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td align="center" colspan=2><h3>##MSG_WHOLE## ##WHOLEPERIOD##</h3></td> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_WORK_PERIOD##: ##DATE##</h3></td> + </tr> + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class="stat1"> + <th>##MSG_NUM##</th> +<!-- HIDE timereport start--> + <th>##MSG_TIME_REPORT##</th> +<!-- HIDE timereport end--> +<!-- HIDE graphreport start--> + <th>##MSG_GRAPH_REPORT##</th> +<!-- HIDE graphreport end--> +<!-- HIDE monthreport start--> + <th>##MSG_MONTH##</th> +<!-- HIDE monthreport end--> + <th>##MSG_USER##</th> +<!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> +<!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <th>##MSG_BYTES##</th> + <th>%</th> + <th>##MSG_CUMULATIVE##</th> + </tr> + + <tr> + <td></td> + </tr> + +<!-- VARIABLE oddattr bgcolor="white" --> +<!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + +<!-- [[ user start--> + <tr ##ROWATTR##> + <td border="0" align="right"><font size="-1">##USERNUM##</font></td> +<!-- HIDE timereport start--> + <td align="center"><A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A></td> +<!-- HIDE timereport end--> +<!-- HIDE graphreport start--> + <td align="center"><A HREF="##GRAPHURL_L##"><img src="get.cgi?png=graph" border="0" title="Graph Report"></A></td> +<!-- HIDE graphreport end--> +<!-- HIDE monthreport start--> + <td align="center"><A HREF="##USERMONTHURL_L##">##USERMONTHURL_B##</A></td> +<!-- HIDE monthreport end--> + <td ><A HREF="##USERURL_L##">##USERURL_B##</A></td> +<!-- HIDE realname start--> + <td align="right" nowrap="true"><font size="-1">##REALNAME##</font></td> +<!-- HIDE realname end--> + <td align="right"><font size="-1">##USERCONNECT##</font></td> + <td align="right"><font size="-1">##USERBYTES##</font></td> + <td align="right"><font size="-1">##USERPERCENT##%</font></td> + <td align="right"><font size="-1">##ALLUSERTOTAL##</font></td> + </tr> +<!-- ]] user end--> + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novopf/print.css b/config/lightsquid/tpl/novopf/print.css new file mode 100755 index 00000000..ce7ac422 --- /dev/null +++ b/config/lightsquid/tpl/novopf/print.css @@ -0,0 +1,119 @@ +.noprint { + display: none; +} + +.print0 { + width: 0; + margin: 0; + padding: 0; +} + +body { + margin: 0; + padding: 0; + color: black; + background: white; + font-family: verdana, arial, sans-serif; + font-size: 100%; + font-weight: normal; +} + +img { + border: 0; +} + +a, a:visited { + color: black; + text-decoration: none; + border: 0; +} + +div.page { + margin: 0 1em 0 1em; +} + +h1 { + margin: 0; + padding: 0; + font-size: 50%; + text-align: right; + color: black; + background: white; + border-bottom: 1px solid black; +} + +h1 a, h1 a:visited, h1 a:hover { + color: white; + text-decoration: none; + border: 0; +} + +h2 { + font-size: 110%; + text-align: left; + font-weight: bold; +} + +div.periodselector { + display: none; +} + +div.monthselector { + display: inline; +} + +form.yearselector { + display: inline; +} + +div.side { + display: none; +} + +div.main { + width: 100%; +} + +table { + margin: auto; + border-collapse: collapse; + width: 100%; + text-align: center; + font-size: 80%; +} + +th { + padding: 0.2em; + border: 1px solid black; + text-align: center; + color: black; + background: lightgray; +} + +td { + padding: 0.2em; + border: 1px solid black; +} + +tr.total { + border-top: 3px double black; + font-weight: bold; +} + +tr.odd { + background: white; +} + +tr.even { + background: #EFF2FF; +} + +tr.sunday { + background: #FFEFFF; +} + +div.copyright { + margin: 0.5em; + padding: 0.5em; + text-align: center; +} diff --git a/config/lightsquid/tpl/novopf/screen.css b/config/lightsquid/tpl/novopf/screen.css new file mode 100755 index 00000000..65001246 --- /dev/null +++ b/config/lightsquid/tpl/novopf/screen.css @@ -0,0 +1,143 @@ +img { + border: 0; + vertical-align: middle; +} + +a { + color: #697896; + font-weight: bold; + text-decoration: none; +} +a.img, a.img:hover { + border: 0; +} + +a.selected { + border: 1px solid #A8C5D3; + background: #dbe2ff; +} + +a:visited { + font-weight: bold; + color: #697896; +} + +h1.title { + margin: 0; + font-size: 120%; + text-align: center; + color: white; +} + + +h2 { + margin: 0; + font-size: 110%; + text-align: center; +} + +h3 { + margin: 0; + font-size: 100%; + text-align: center; +} + +table { + border-collapse: collapse; + margin: auto; + text-align: center; + font-size: "90%"; + border-color: "white"; + width: "90%"; +} + +table.title { + border-collapse: collapse; + margin: auto; + text-align: center; + color: #777777; + width: 100%; +} + +table.calendar { + border-collapse: collapse; + margin: auto; + text-align: center; + width: "33%"; + background: white; + color: #535F77; + border: 1px solid #BDBDBD; +} + +table.stat { + border-collapse: collapse; + border: 1px solid #BDBDBD; + margin: auto; + text-align: center; + width: "100%"; + color: #535F77; +} + +table.sites { + border-collapse: collapse; + border: 1px solid #BDBDBD; + margin: auto; + text-align: left; + width: "100%"; + color: #535F77; + background: white; +} + +th.title { + border: 1px solid #BDBDBD; + background: #990000; +} + +th.sites { + text-align: center; + background: #BDBDBD; + border: 1px solid #BDBDBD; + font-size: 90%; +} + +tr.title { + border: 1px solid #BDBDBD; + background: #990000; + color: white; +} + +tr.calendar { + border: 1px solid #BDBDBD; + color: #535F77; + background: #BDBDBD; +} + +tr.stat1 { + background: #BDBDBD; + border: 1px solid #BDBDBD; +} + +tr.total { + font-weight: bold; + background: #EFEFEF; + border: 1px solid #BDBDBD; +} + +tr.footer { + background: #990000; + color: white; +} + +td.sites { + text-align: left; + border: 1px solid #BDBDBD; + text-align: center; +} + +tr.ls { + border: 1px solid #BDBDBD; +} + +tr.dataarea { + background: #E7E7E7; +} diff --git a/config/lightsquid/tpl/novopf/topsites.html b/config/lightsquid/tpl/novopf/topsites.html new file mode 100755 index 00000000..cfc3c781 --- /dev/null +++ b/config/lightsquid/tpl/novopf/topsites.html @@ -0,0 +1,75 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Top Site</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan=2><h2>##MSG_TOP_SITES##</h2></td> + </tr> + <tr> + <td colspan=2><h3>##MSG_WORK_PERIOD##: ##DATE##</h3></td> + </tr> + <tr> + <td colspan="2"> + + <table width="100%" class="stat"> + <tbody> + <!-- VARIABLE selectedattr bgcolor="#BBCCEE" --> + <tr class=stat1> + <th>¹</th> + <th></th> + <th align="left">##MSG_ACCESSED_SITE##</th> + <th ##SORTCONNECTATTR##><A HREF="##SORTCONNECTURL_L##">##SORTCONNECTURL_B##</A></th> + <th ##SORTBYTESATTR##><A HREF="##SORTBYTESURL_L##">##SORTBYTESURL_B##</A></th> + <th>%</th> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + +<!-- [[ site start--> + <tr ##ROWATTR##> + <td align="center"><font size="-1"><font size="-1">##SITENUM##</font></font></td> + <td align="left"><A HREF="##SITEURLWHO_L##">##SITEURLWHO_B##</A></td> + <td align="left"><A HREF="##SITEURL_L##">##SITEURL_B##</A></td> + <td align="right"><font size="-1">##SITECONNECT##</font></td> + <td align="right"><font size="-1">##SITEBYTES##</font></td> + <td align="right"><font size="-1">##SITEPERCENT##%</font></td> + </tr> +<!-- ]] site end--> + <tr class="total"> + <td colspan="4" align="left">##MSG_TOTAL##</td> + <td align="right">##TOTAL##</td> + <td class="noprint"> </td> + </tr> + </tbody> + </table> + + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novopf/user_detail.html b/config/lightsquid/tpl/novopf/user_detail.html new file mode 100755 index 00000000..b3a7b168 --- /dev/null +++ b/config/lightsquid/tpl/novopf/user_detail.html @@ -0,0 +1,98 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: User Detail</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2"><h3>##MSG_USER##: ##USER##</h3></td> + </tr> +<!-- HIDE group start --> + <tr> + <td colspan="2">##MSG_GROUP##: ##GROUP##</td> + </tr> +<!-- HIDE group end --> + <tr> + <td colspan="2">##MSG_DATE##: ##WORKPERIOD##</td> + </tr> +<!-- HIDE timereport start--> + <tr> + <td colspan="2" align="center" >-= <A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A> =-</td> + </tr> +<!-- HIDE timereport end--> + <tr> + <td colspan="2"><A HREF="##BIGFILESURL_L##">##BIGFILESURL_B##</A></td> + </tr> + + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class=total> + <th align="left" >##MSG_TOTAL##</th> + <th> </th> + <th> </th> + <th align="right" nowrap="true">##TOTAL##</th> + <th colspan=2> </th> + </tr> + + <tr class=stat1> + <th>##MSG_NUM##</th> + <th>##MSG_ACCESSED_SITE##</th> + <th>##MSG_CONNECT##</th> + <th>##MSG_BYTES##</th> + <th>##MSG_CUMULATIVE##</th> + <th>%</th> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> +<!-- [[ site start--> + <tr ##ROWATTR##> + <td align="center">##NUM##</td> + <td align="left"><A HREF="##SITEURL_L##">##SITEURL_B##</A></td> + <td align="right" nowrap="true">##SITECONNECT##</td> + <td align="right" nowrap="true">##SITEBYTES##</td> + <td align="right" nowrap="true">##SITETOTAL##</td> + <td align="right" nowrap="true">##SITEPERCENT##%</td> + </tr> +<!-- ]] site end--> + + <tr class=total> + <th align="left" >##MSG_TOTAL##</th> + <th align="right"> </th> + <th align="right"> </th> + <th align="right" nowrap="true">##TOTAL##</th> + <th align="right"> </th> + <th align="right"> </th> + </tr> + </tbody> + </table> + + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> +</center> +</body> +</html> diff --git a/config/lightsquid/tpl/novopf/user_month.html b/config/lightsquid/tpl/novopf/user_month.html new file mode 100755 index 00000000..de7d8cab --- /dev/null +++ b/config/lightsquid/tpl/novopf/user_month.html @@ -0,0 +1,83 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<HTML> +<HEAD> + <META name="robots" content="noindex,nofollow"> + <META name="generator" content="LightSquid - http://lightsquid.sf.net"> + <META http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <TITLE>LightSquid :: User Month detail</TITLE> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</HEAD> + +<BODY background="" bgcolor="white" text="black"> + + <center> + <table class="title"> + <tbody> + <tr class="title"> + <th align="center"><a href="index.cgi"><h1 class="title">##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_USER##: ##USER##</h3></td> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_WORK_PERIOD##: ##WORKPERIOD##</h3></td> + </tr> + <tr> + <TD colspan="2" align="center">##MSG_TOTAL##: ##TOTALBYTES##</TD> + </tr> + <tr> +<!-- HIDE graphreport start--> + <td colspan="2" align="center"><A HREF="##GRAPHURL_L##"><img src="get.cgi?png=graph" border="0" title="Graph Report"> +<!-- HIDE graphreport end--> + </tr> + <tr> + <td colspan="2"> + <table width="100%" class="stat"> + <tbody> + <TR class="stat1"> + <TH>##MSG_DATE##</TH> + <TH>##MSG_BYTES##</TH> + <TH>##MSG_WEEKSUM##</th> + <TH>##MSG_CUMULATIVE##</th> + </TR> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + <!-- VARIABLE sundayattr bgcolor="bisque" --> + <!-- VARIABLE nooversizedattr color="black" --> + <!-- VARIABLE oversizedattr color="red" --> + + <!-- [[ day start--> + <TR ##DAYATTR##> + <TD align="center"><FONT size="-1"><A HREF="##DAYDATE_L##">##DAYDATE_B##</A></FONT></TD> + <TD align="right" nowrap="true"><FONT size="-1" ##OVERSIZEATTR##>##DAYBYTES##</FONT></TD> + <td align="right" nowrap="true">##WEEKSUM##</td> + <td align="right" nowrap="true"><font size="-2">##DAYCUMULATIVE##</font></td> + </TR> + <!-- ]] day end--> + + <TR class="total"> + <TD align="center">##MSG_TOTAL##</TD> + <TD align="right" nowrap="true"><FONT size="-1">##TOTALBYTES##</FONT></TD> + <td align="right" nowrap="true"> </td> + <td align="right" nowrap="true"> </td> + </TR> + </tbody> + </table> + </td> + </tr> + + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </TBODY> + </TABLE> + </CENTER> +</BODY> +</HTML> diff --git a/config/lightsquid/tpl/novopf/user_time.html b/config/lightsquid/tpl/novopf/user_time.html new file mode 100755 index 00000000..14183006 --- /dev/null +++ b/config/lightsquid/tpl/novopf/user_time.html @@ -0,0 +1,111 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: User Detail by TIME </title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2"><h3>##MSG_USER##: ##USER##</h3></td> + </tr> + + <tr> + <td colspan="2"><h3>##MSG_DATE##: ##WORKPERIOD##</h3></td> + </tr> + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class="stat1"> + <th>##MSG_NUM##</th> + <th>##MSG_ACCESSED_SITE##</th> + <th>00</th> + <th>01</th> + <th>02</th> + <th>03</th> + <th>04</th> + <th>05</th> + <th>06</th> + <th>07</th> + <th>08</th> + <th>09</th> + <th>10</th> + <th>11</th> + <th>12</th> + <th>13</th> + <th>14</th> + <th>15</th> + <th>16</th> + <th>17</th> + <th>18</th> + <th>19</th> + <th>20</th> + <th>21</th> + <th>22</th> + <th>23</th> + <th>##MSG_TOTAL##</th> + </tr> + +<!-- VARIABLE oddattr bgcolor="white" --> +<!-- VARIABLE evenattr bgcolor="#F5F5F5" --> +<!-- VARIABLE totalattr bgcolor=#E5EFF4 --> + +<!-- [[ site start--> + <tr ##ROWATTR##> + <td align="center">##NUM##</td> + <td align="left">##URL##</td> + <td align="center"><font size="-1">##T00##</font></td> + <td align="center"><font size="-1">##T01##</font></td> + <td align="center"><font size="-1">##T02##</font></td> + <td align="center"><font size="-1">##T03##</font></td> + <td align="center"><font size="-1">##T04##</font></td> + <td align="center"><font size="-1">##T05##</font></td> + <td align="center"><font size="-1">##T06##</font></td> + <td align="center"><font size="-1">##T07##</font></td> + <td align="center"><font size="-1">##T08##</font></td> + <td align="center"><font size="-1">##T09##</font></td> + <td align="center"><font size="-1">##T10##</font></td> + <td align="center"><font size="-1">##T11##</font></td> + <td align="center"><font size="-1">##T12##</font></td> + <td align="center"><font size="-1">##T13##</font></td> + <td align="center"><font size="-1">##T14##</font></td> + <td align="center"><font size="-1">##T15##</font></td> + <td align="center"><font size="-1">##T16##</font></td> + <td align="center"><font size="-1">##T17##</font></td> + <td align="center"><font size="-1">##T18##</font></td> + <td align="center"><font size="-1">##T19##</font></td> + <td align="center"><font size="-1">##T20##</font></td> + <td align="center"><font size="-1">##T21##</font></td> + <td align="center"><font size="-1">##T22##</font></td> + <td align="center"><font size="-1">##T23##</font></td> + <td align="right" nowrap="true"><font size="-1">##URLSIZE##</font></td> + </tr> + <!-- ]] site end--> + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novopf/whousesite.html b/config/lightsquid/tpl/novopf/whousesite.html new file mode 100755 index 00000000..ffd288f4 --- /dev/null +++ b/config/lightsquid/tpl/novopf/whousesite.html @@ -0,0 +1,86 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Who Use Site report</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class="title">##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <th colspan="2"><h2>##MSG_USER_WHO_USE_SITE##<br>##SITE##</h2></th> + </tr> + <tr> + <td colspan=2><b>##MSG_WORK_PERIOD##: ##DATE##</b></td> + </tr> + + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class=stat1> + <th align="left" >##MSG_USER##</th> +<!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> +<!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <th>##MSG_SIZE##</th> + <!-- HIDE daylist start --> + <th>##MSG_DAYLIST##</th> + <!-- HIDE daylist end --> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> +<!-- [[ who start--> + <tr ##ROWATTR##> + <td align="left" >##WHOUSER##</td> +<!-- HIDE realname start--> + <td align="right" nowrap="true">##REALNAME##</td> +<!-- HIDE realname end--> + <td align="right">##WHOCONNECT##</td> + <td align="right">##WHOSIZE##</td> + <!-- HIDE daylist start --> + <td align="right"><A HREF="##USEDAYURL_L##">##USEDAYURL_B##</A></td> + <!-- HIDE daylist end --> + </tr> + <!-- ]] who end--> + + <tr class=total> + <th align="left">##MSG_TOTAL##</th> +<!-- HIDE realname start--> + <td> </td> +<!-- HIDE realname end--> + <th align="right">##TOTALCONNECT##</th> + <th align="right">##TOTAL##</th> + <!-- HIDE daylist start --> + <th></th> + <!-- HIDE daylist end --> + </tr> + </tbody> + </table> + + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </td> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/bigfiles.html b/config/lightsquid/tpl/novosea/bigfiles.html new file mode 100755 index 00000000..138d4181 --- /dev/null +++ b/config/lightsquid/tpl/novosea/bigfiles.html @@ -0,0 +1,72 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Big Files Report</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body background="" bgcolor="white" text="black"> + <center> + <table class=title> + <tbody> + <TR class=title> + <TH><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></TH> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </TR> + <tr> + <th colspan="2" align="center"><h2>##MSG_BIG_FILE_DOWNLOAD_REPORT##</h2></th> + </tr> + <tr> + <th colspan="2" align="center"><h3>##MSG_DATE##: ##DATE##</h3></th> + </tr> +<!-- HIDE reportuser start--> + <tr> + <th colspan="2" align="center"><h3>##MSG_USER##: ##REPORTUSER##</h3></th> + </tr> +<!-- HIDE reportuser end--> + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class=stat1> + <th>##MSG_NUM##</th> + <th>##MSG_TIME##</th> + <th>##MSG_USER##</th> + <th>##MSG_SIZE##</th> + <th>##MSG_URL##</th> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + <!-- VARIABLE total bgcolor="E5EFF4" --> + +<!-- [[ bigfile start--> + <tr ##ROWATTR##> + <td align="left" >##BFILENUM##</td> + <td align="left" >##BFILETIME##</td> + <td align="left" ><A HREF="##BFILEUSER_L##">##BFILEUSER_B##</A></td> + <td align="right" nowrap="true">##BFILESIZE##</td> + <td align="right" >##BFILELINK##</td> + </tr> +<!-- ]] bigfile end--> + + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/day_detail.html b/config/lightsquid/tpl/novosea/day_detail.html new file mode 100755 index 00000000..6c432ba0 --- /dev/null +++ b/config/lightsquid/tpl/novosea/day_detail.html @@ -0,0 +1,108 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Day detail</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <!-- Title --> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2"><h2>##MSG_DATE##: <b>##DATE## </h2></td> + </tr> + <tr> + <td colspan="2"><h3><A HREF="##TOPSITESURL_L##">##TOPSITESURL_B##</A> ##MSG_REPORT##</h3></td> + </tr> + <tr> + <td colspan="2"><h3><A HREF="##BIGFILESURL_L##">##BIGFILESURL_B##</A> ##MSG_REPORT##</h3></td> + </tr> + + <!-- Statistic data --> + <tr> + <td colspan="2"> + <table width=100% class=stat> + <tbody> + <!-- HIDE overuser start--> + <tr> + <td colspan="11">##OVERMSG##</td> + </tr> + <!-- HIDE overuser end--> + + <tr class=stat1> + <th>##MSG_NUM##</th> + <!-- HIDE timereport start--> + <th>##MSG_TIME_REPORT##</th> + <!-- HIDE timereport end--> + <th>##MSG_USER##</th> + <!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> + <!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <!-- HIDE putpost start--> + <th>##MSG_PUTPOST##</th> + <!-- HIDE putpost end--> + <th>##MSG_BYTES##</th> + <th>%</th> + <!-- HIDE group start --> + <th>##MSG_GROUP##</th> + <!-- HIDE group end --> + </tr> + + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + + <!-- VARIABLE !putpostnormalattr color="black" --> + <!-- VARIABLE !putpostwarningattr color="red" --> + + <!-- VARIABLE putpostnormalattr </> --> + <!-- VARIABLE putpostwarningattr <img src="get.cgi?png=flag_red" border="0" title="Graph Report"> --> + + <!-- [[ user start--> + <tr ##ROWATTR##> + <td align="right">##USERNUM##</td> + <!-- HIDE timereport start--> + <td align="center"><A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A></td> + <!-- HIDE timereport end--> + <td align="left"><A HREF="##USERURL_L##">##USERURL_B##</A></td> + <!-- HIDE realname start--> + <td align="left" nowrap="true">##REALNAME##</td> + <!-- HIDE realname end--> + <td align="right" nowrap="true">##USERCONNECT##</td> + <!-- HIDE putpost start--> + <td align="right" nowrap="true">##USERPUTPOST####OVERPUTPOSTATTR##</td> + <!-- HIDE putpost end--> + <td align="right" nowrap="true">##USERBYTES##</td> + <td align="right">##USERPERCENT##%</td> + <!-- HIDE group start --> + <td align="left"><a HREF="##USERGROUPURL_L##">##USERGROUPURL_B##</a></td> + <!-- HIDE group end --> + </tr> + <!-- ]] user end--> + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/graph.html b/config/lightsquid/tpl/novosea/graph.html new file mode 100755 index 00000000..4490f4d3 --- /dev/null +++ b/config/lightsquid/tpl/novosea/graph.html @@ -0,0 +1,54 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Graphics</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class="title"> + <tbody> + <tr class=title> + <th align="center"><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_WORK_PERIOD##: ##WORKPERIOD##</h3></td> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MODE##</h3></td> + </tr> + <tr> + <td colspan="2"> + <img src="##GRAPHICSURL##" border="0" title="Graphics" usemap="#bars"> + <map name="bars"> +<!-- [[ imagemap start--> + <area href="##MAPURL##" shape="rect" coords="##MAPCOORD##"> +<!-- ]] imagemap end--> + </map> + </td> + </tr> + <tr> + <td colspan="2"> +<!-- HIDE warning start --> + <center>##MSG_WARNING##, ##MSG_RECOMENDATION## $##VARNAME##=##VARVALUE##*(1024*1024*1024);</center> +<!-- HIDE warning end --> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/group_detail.html b/config/lightsquid/tpl/novosea/group_detail.html new file mode 100755 index 00000000..79b62db3 --- /dev/null +++ b/config/lightsquid/tpl/novosea/group_detail.html @@ -0,0 +1,134 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Day detail - Group Mode</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th align="center"><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_DATE##: ##DATE## </h3></td> + </tr> +<!-- HIDE dayinfo start--> + <tr> + <td colspan="2"><A HREF="##TOPSITESURL_L##">##TOPSITESURL_B##</A><h3>##MSG_REPORT##</h3></td> + </tr> + <tr> + <td colspan="2"><A HREF="##BIGFILESURL_L##">##BIGFILESURL_B##</A><h3>##MSG_REPORT##</h3></td> + </tr> +<!-- HIDE dayinfo end --> + </tbody> + </table> + </center> + + <center> + <table> + <tbody> + <tr> + <td> + <table width="100%" class=stat> + <tbody> + <tr width="100%" class=stat1> + <th>##MSG_NUM##</th> +<!-- HIDE timereport start--> + <th>##MSG_TIME_REPORT##</th> +<!-- HIDE timereport end--> + <th>##MSG_USER##</th> +<!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> +<!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <th>##MSG_BYTES##</th> + <th>%</th> + </tr> + +<!-- [[ groupstart start--> + <tr> + <td colspan="7"><A name="##GROUPSTARTURL_L##">##GROUPSTARTURL_B##</A></td> + </tr> +<!-- ]] groupstart end--> + +<!-- VARIABLE oddattr bgcolor="white" --> +<!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + +<!-- [[ user start--> + <tr ##ROWATTR##> + <td>##USERNUM##</td> +<!-- HIDE timereport start--> + <td><A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A></td> +<!-- HIDE timereport end--> + <td><A HREF="##USERURL_L##">##USERURL_B##</A></td> +<!-- HIDE realname start--> + <td align="right" nowrap="true">##REALNAME##</td> +<!-- HIDE realname end--> + <td align="right">##USERCONNECT##</td> + <td align="right">##USERBYTES##</td> + <td align="right">##USERPERCENT##%</td> + </tr> +<!-- ]] user end--> + +<!-- [[ groupend start--> + <tr> + <td colspan="3"></td> +<!-- HIDE timereport start--> + <td></td> +<!-- HIDE timereport end--> +<!-- HIDE realname start--> + <td></td> +<!-- HIDE realname end--> + <td align="right">##GROUPENDBYTES##</td> + <td align="right">##GROUPENDPERCENT##%</td> + </tr> +<!-- ]] groupend end--> + + </tbody> + </table> + </td> + + <!-- Rigth Column --> + <td style="width: 20%; vertical-align: top; text-align: center;"> + <table width="100%" class=sites> + <tbody> + <tr> + <th class=sites align="right">##MSG_NUM##</th> + <th class=sites>##MSG_GROUP##</th> + <th class=sites align="right">##MSG_BYTES##</th> + <th class=sites align="right">%</th> + </tr> + +<!-- [[ grouplist start--> + <tr ##GROUPROWATTR##> + <td class=sites border="0" align="right">##GROUPLISTNUM##</td> + <td class=sites><A HREF="##GROUPLISTNAMEURL_L##">##GROUPLISTNAMEURL_B##</A></td> + <td class=sites align="right">##GROUPLISTBYTES##</td> + <td class=sites align="right">##GROUPLISTPERCENT##</td> + </tr> +<!-- ]] grouplist end--> + + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> + </body> +</html> diff --git a/config/lightsquid/tpl/novosea/images/datetime.png b/config/lightsquid/tpl/novosea/images/datetime.png Binary files differnew file mode 100755 index 00000000..e2672c20 --- /dev/null +++ b/config/lightsquid/tpl/novosea/images/datetime.png diff --git a/config/lightsquid/tpl/novosea/images/flag_red.png b/config/lightsquid/tpl/novosea/images/flag_red.png Binary files differnew file mode 100755 index 00000000..e8a602da --- /dev/null +++ b/config/lightsquid/tpl/novosea/images/flag_red.png diff --git a/config/lightsquid/tpl/novosea/images/graph.png b/config/lightsquid/tpl/novosea/images/graph.png Binary files differnew file mode 100755 index 00000000..9051fbc6 --- /dev/null +++ b/config/lightsquid/tpl/novosea/images/graph.png diff --git a/config/lightsquid/tpl/novosea/images/groups.png b/config/lightsquid/tpl/novosea/images/groups.png Binary files differnew file mode 100755 index 00000000..d2cfc00d --- /dev/null +++ b/config/lightsquid/tpl/novosea/images/groups.png diff --git a/config/lightsquid/tpl/novosea/images/printer.png b/config/lightsquid/tpl/novosea/images/printer.png Binary files differnew file mode 100755 index 00000000..a350d187 --- /dev/null +++ b/config/lightsquid/tpl/novosea/images/printer.png diff --git a/config/lightsquid/tpl/novosea/images/users.png b/config/lightsquid/tpl/novosea/images/users.png Binary files differnew file mode 100755 index 00000000..e2e2f36a --- /dev/null +++ b/config/lightsquid/tpl/novosea/images/users.png diff --git a/config/lightsquid/tpl/novosea/index.html b/config/lightsquid/tpl/novosea/index.html new file mode 100755 index 00000000..cf68c86d --- /dev/null +++ b/config/lightsquid/tpl/novosea/index.html @@ -0,0 +1,164 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> + +<HTML> +<HEAD> + <META name="robots" content="noindex,nofollow"> + <META name="generator" content="LightSquid - http://lightsquid.sf.net"> + <META http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <TITLE>LightSquid :: Index</TITLE> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</HEAD> + +<BODY> + <CENTER> + <!-- Title --> + <TABLE class=title> + <TBODY> + <TR class=title> + <TH><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></TH> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </TR> + <TR> + <TD colspan="2"><h2>##MSG_WORK_PERIOD##: ##WORKPERIOD##</h2></TD> + </TR> + + <TR> + <TD align="center" colspan="2"> + <!-- Calendar --> + <TABLE class=calendar> + <TBODY> + <TR> + <TH colspan="12">##MSG_CALENDAR##</TH> + </TR> + <TR class=calendar> + <!-- VARIABLE yearselected bgcolor="#BBCCEE" --> + <!-- [[ year start--> + <TD colspan="##YEARCOLSPAN##" ##YEARSELECTED##> + <a href="##YEARURL_L##">##YEARURL_B##</a><br> + </TD> + <!-- ]] year end--> + </TR> + <TR> + <!-- VARIABLE monthselected bgcolor="#BBCCEE" --> + <!-- [[ month start--> + <TD ##MONTHSELECTED##><a href="##MONTHURL_L##">##MONTHURL_B##</a></TD> + <!-- ]] month end--> + </TR> + </TBODY> + </TABLE> + </TD> + </TR> + + <!-- Statistic data --> + <TR><TD></TD></TR> + <TR><TD> + <TABLE width="100%" class=stat> + <TBODY> + <TR class=stat1> + <TH>##MSG_DATE##</TH> + <!-- HIDE group start --> + <TH>##MSG_GROUP##</TH> + <!-- HIDE group end --> + <TH>##MSG_USERS##</TH> + <!-- HIDE oversize start --> + <TH>##MSG_OVERSIZE##</TH> + <!-- HIDE oversize end --> + <TH>##MSG_BYTES##</TH> + <TH>##MSG_AVERAGE##</TH> + <TH>##MSG_HIT%##</TH> + </TR> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + <!-- VARIABLE sundayattr bgcolor="beige" --> + <!-- VARIABLE saturdayattr bgcolor="#F0EFC7" --> + + <!-- [[ day start--> + <TR ##DAYATTR##> + <TD align="center"><A HREF="##DAYDATE_L##">##DAYDATE_B##</A></TD> + <!-- HIDE group start --> + <TD align="center"><A HREF="##DAYGROUP_L##">##DAYGROUP_B##</A></TD> + <!-- HIDE group end --> + <TD align="center">##DAYUSERS##</TD> + + <!-- HIDE oversize start--> + <TD align="center"><A HREF="##DAYOVERUSERS_L##">##DAYOVERUSERS_B##</A></TD> + <!-- HIDE oversize end--> + <TD align="right" nowrap="true">##DAYBYTES##</TD> + <TD align="right">##DAYAVERAGE##</TD> + <TD align="right">##DAYCACHEHIT##%</TD> + </TR> + <!-- ]] day end--> + + <!-- Summary --> + <TR class=total> + <TD align="left">##MSG_TOTAL_AVERAGE##:</Td> + <!-- HIDE group start --> + <TD> </TD> + <!-- HIDE group end --> + <TD align="center">##USERAVERAGE##</TD> + <!-- HIDE oversize start--> + <TD align="center">##OVERUSERAVERAGE##</TD> + <!-- HIDE oversize end --> + <TD align="right"><A HREF="##TOTAL_L##">##TOTAL_B##</A></TD> + <TD align="right">##TOTALAVERAGE##</TD> + <TD align="right">##AVERAGEHIT##%</TD> + </TR> + </TBODY> + </TABLE> + </TD> + + <TD style="width: 20%; vertical-align: top; text-align: center;"> + <!-- Popular sites --> + <TABLE width="100%" class="sites"> + <TBODY> + <TR> + <TH colspan="2" class="sites">##MSG_TOP_SITES##</TH> + </TR> + <TR> + <TD class="sites"><A HREF="##TOP_YEAR_L##">##TOP_YEAR_B##</A></TD> + <!-- HIDE monthtop start --> + <TD class="sites"><A HREF="##TOP_MONTH_L##">##TOP_MONTH_B##</A></TD> + </TR> + + <TR> + <TH colspan="2" class="sites">##MSG_TOTAL##</TH> + </TR> + <TR> + <TD class="sites"><A HREF="##TOTAL_YEAR_L##">##TOTAL_YEAR_B##</A></TD> + <TD nowrap="nowrap" class="sites"> + <A HREF="##TOTAL_MONTH_L##">##TOTAL_MONTH_B##</A> + <!-- HIDE graph start --> + <A HREF="##MONTH_GRAPH_L##"><img src="get.cgi?png=graph" border="0" title="Graph Report"></A> + <!-- HIDE graph end --> + </TD> + </TR> + + <TR> + <TH colspan="2" class="sites">##MSG_GROUP##</TH> + </TR> + <TR> + <TD class="sites"><A HREF="##GROUP_YEAR_L##">##GROUP_YEAR_B##</A></TD> + <TD class="sites"><A HREF="##GROUP_MONTH_L##">##GROUP_MONTH_B##</TD> + <!-- HIDE monthtop end --> + </TR> + </TBODY> + </TABLE> + </TD> + </TR> + + <!-- Footer --> + <TR><TD></TD></TR> + <TR> + <TD colspan="2"> + ##COPYRIGHT## + </TD> + </TR> + </TBODY> + </TABLE> + </CENTER> +</BODY> +</HTML> diff --git a/config/lightsquid/tpl/novosea/month_detail.html b/config/lightsquid/tpl/novosea/month_detail.html new file mode 100755 index 00000000..ec637367 --- /dev/null +++ b/config/lightsquid/tpl/novosea/month_detail.html @@ -0,0 +1,95 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Whole Month User Report</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class="title"> + <tbody> + <tr class="title"> + <th align="center"><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td align="center" colspan=2><h3>##MSG_WHOLE## ##WHOLEPERIOD##</h3></td> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_WORK_PERIOD##: ##DATE##</h3></td> + </tr> + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class="stat1"> + <th>##MSG_NUM##</th> +<!-- HIDE timereport start--> + <th>##MSG_TIME_REPORT##</th> +<!-- HIDE timereport end--> +<!-- HIDE graphreport start--> + <th>##MSG_GRAPH_REPORT##</th> +<!-- HIDE graphreport end--> +<!-- HIDE monthreport start--> + <th>##MSG_MONTH##</th> +<!-- HIDE monthreport end--> + <th>##MSG_USER##</th> +<!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> +<!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <th>##MSG_BYTES##</th> + <th>%</th> + <th>##MSG_CUMULATIVE##</th> + </tr> + + <tr> + <td></td> + </tr> + +<!-- VARIABLE oddattr bgcolor="white" --> +<!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + +<!-- [[ user start--> + <tr ##ROWATTR##> + <td border="0" align="right"><font size="-1">##USERNUM##</font></td> +<!-- HIDE timereport start--> + <td align="center"><A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A></td> +<!-- HIDE timereport end--> +<!-- HIDE graphreport start--> + <td align="center"><A HREF="##GRAPHURL_L##"><img src="get.cgi?png=graph" border="0" title="Graph Report"></A></td> +<!-- HIDE graphreport end--> +<!-- HIDE monthreport start--> + <td align="center"><A HREF="##USERMONTHURL_L##">##USERMONTHURL_B##</A></td> +<!-- HIDE monthreport end--> + <td ><A HREF="##USERURL_L##">##USERURL_B##</A></td> +<!-- HIDE realname start--> + <td align="right" nowrap="true"><font size="-1">##REALNAME##</font></td> +<!-- HIDE realname end--> + <td align="right"><font size="-1">##USERCONNECT##</font></td> + <td align="right"><font size="-1">##USERBYTES##</font></td> + <td align="right"><font size="-1">##USERPERCENT##%</font></td> + <td align="right"><font size="-1">##ALLUSERTOTAL##</font></td> + </tr> +<!-- ]] user end--> + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/print.css b/config/lightsquid/tpl/novosea/print.css new file mode 100755 index 00000000..ce7ac422 --- /dev/null +++ b/config/lightsquid/tpl/novosea/print.css @@ -0,0 +1,119 @@ +.noprint { + display: none; +} + +.print0 { + width: 0; + margin: 0; + padding: 0; +} + +body { + margin: 0; + padding: 0; + color: black; + background: white; + font-family: verdana, arial, sans-serif; + font-size: 100%; + font-weight: normal; +} + +img { + border: 0; +} + +a, a:visited { + color: black; + text-decoration: none; + border: 0; +} + +div.page { + margin: 0 1em 0 1em; +} + +h1 { + margin: 0; + padding: 0; + font-size: 50%; + text-align: right; + color: black; + background: white; + border-bottom: 1px solid black; +} + +h1 a, h1 a:visited, h1 a:hover { + color: white; + text-decoration: none; + border: 0; +} + +h2 { + font-size: 110%; + text-align: left; + font-weight: bold; +} + +div.periodselector { + display: none; +} + +div.monthselector { + display: inline; +} + +form.yearselector { + display: inline; +} + +div.side { + display: none; +} + +div.main { + width: 100%; +} + +table { + margin: auto; + border-collapse: collapse; + width: 100%; + text-align: center; + font-size: 80%; +} + +th { + padding: 0.2em; + border: 1px solid black; + text-align: center; + color: black; + background: lightgray; +} + +td { + padding: 0.2em; + border: 1px solid black; +} + +tr.total { + border-top: 3px double black; + font-weight: bold; +} + +tr.odd { + background: white; +} + +tr.even { + background: #EFF2FF; +} + +tr.sunday { + background: #FFEFFF; +} + +div.copyright { + margin: 0.5em; + padding: 0.5em; + text-align: center; +} diff --git a/config/lightsquid/tpl/novosea/screen.css b/config/lightsquid/tpl/novosea/screen.css new file mode 100755 index 00000000..dbaf4566 --- /dev/null +++ b/config/lightsquid/tpl/novosea/screen.css @@ -0,0 +1,133 @@ +img { + border: 0; + vertical-align: middle; +} + +a { + color: #697896; + font-weight: bold; + text-decoration: none; +} +a.img, a.img:hover { + border: 0; +} + +a.selected { + border: 1px solid #A8C5D3; + background: #dbe2ff; +} + +a:visited { + font-weight: bold; + color: #697896; +} + +h1.title { + margin: 0; + font-size: 120%; + text-align: center; + color: white; +} + + +h2 { + margin: 0; + font-size: 110%; + text-align: center; +} + +h3 { + margin: 0; + font-size: 100%; + text-align: center; +} + +table { + border-collapse: collapse; + margin: auto; + text-align: center; + font-size: "90%"; + border-color: "white"; + width: "90%"; +} + +table.title { + border-collapse: collapse; + margin: auto; + text-align: center; + color: #535F77; + width: 100%; +} + +table.calendar { + border-collapse: collapse; + margin: auto; + text-align: center; + width: "33%"; + background: white; + color: #535F77; + border: 1px solid #A8C5D3; +} + +table.stat { + border-collapse: collapse; + border: 1px solid #A8C5D3; + margin: auto; + text-align: center; + width: "100%"; + color: #535F77; +} + +table.sites { + border-collapse: collapse; + border: 1px solid #A8C5D3; + margin: auto; + text-align: left; + width: "100%"; + color: #535F77; +} + +th.title { + border: 1px solid #005B7A; + background: #7788aa; +} + +th.sites { + text-align: center; + background: #e0eaef; + border: 1px solid #A8C5D3; + font-size: 90%; +} + +tr.title { + border: 1px solid #7788AA; + background: #7788AA; + color: white; +} + +tr.calendar { + border: 1px solid #A8C5D3; + color: #535F77; + background: #F5F5F5; +} + +tr.stat1 { + background: #e0eaef; + border: 1px solid #A8C5D3; +} + +tr.total { + font-weight: bold; + background: #E5EFF4; + border: 1px solid #A8C5D3; +} + +td.sites { + text-align: left; + border: 1px solid #A8C5D3; + text-align: center; +} + +tr.ls { + border: 1px solid #A8C5D3; +} diff --git a/config/lightsquid/tpl/novosea/topsites.html b/config/lightsquid/tpl/novosea/topsites.html new file mode 100755 index 00000000..cfc3c781 --- /dev/null +++ b/config/lightsquid/tpl/novosea/topsites.html @@ -0,0 +1,75 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Top Site</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan=2><h2>##MSG_TOP_SITES##</h2></td> + </tr> + <tr> + <td colspan=2><h3>##MSG_WORK_PERIOD##: ##DATE##</h3></td> + </tr> + <tr> + <td colspan="2"> + + <table width="100%" class="stat"> + <tbody> + <!-- VARIABLE selectedattr bgcolor="#BBCCEE" --> + <tr class=stat1> + <th>¹</th> + <th></th> + <th align="left">##MSG_ACCESSED_SITE##</th> + <th ##SORTCONNECTATTR##><A HREF="##SORTCONNECTURL_L##">##SORTCONNECTURL_B##</A></th> + <th ##SORTBYTESATTR##><A HREF="##SORTBYTESURL_L##">##SORTBYTESURL_B##</A></th> + <th>%</th> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + +<!-- [[ site start--> + <tr ##ROWATTR##> + <td align="center"><font size="-1"><font size="-1">##SITENUM##</font></font></td> + <td align="left"><A HREF="##SITEURLWHO_L##">##SITEURLWHO_B##</A></td> + <td align="left"><A HREF="##SITEURL_L##">##SITEURL_B##</A></td> + <td align="right"><font size="-1">##SITECONNECT##</font></td> + <td align="right"><font size="-1">##SITEBYTES##</font></td> + <td align="right"><font size="-1">##SITEPERCENT##%</font></td> + </tr> +<!-- ]] site end--> + <tr class="total"> + <td colspan="4" align="left">##MSG_TOTAL##</td> + <td align="right">##TOTAL##</td> + <td class="noprint"> </td> + </tr> + </tbody> + </table> + + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/user_detail.html b/config/lightsquid/tpl/novosea/user_detail.html new file mode 100755 index 00000000..b3a7b168 --- /dev/null +++ b/config/lightsquid/tpl/novosea/user_detail.html @@ -0,0 +1,98 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: User Detail</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2"><h3>##MSG_USER##: ##USER##</h3></td> + </tr> +<!-- HIDE group start --> + <tr> + <td colspan="2">##MSG_GROUP##: ##GROUP##</td> + </tr> +<!-- HIDE group end --> + <tr> + <td colspan="2">##MSG_DATE##: ##WORKPERIOD##</td> + </tr> +<!-- HIDE timereport start--> + <tr> + <td colspan="2" align="center" >-= <A HREF="##TIMEURL_L##"><img src="get.cgi?png=datetime" border="0" title="Graph Report"></A> =-</td> + </tr> +<!-- HIDE timereport end--> + <tr> + <td colspan="2"><A HREF="##BIGFILESURL_L##">##BIGFILESURL_B##</A></td> + </tr> + + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class=total> + <th align="left" >##MSG_TOTAL##</th> + <th> </th> + <th> </th> + <th align="right" nowrap="true">##TOTAL##</th> + <th colspan=2> </th> + </tr> + + <tr class=stat1> + <th>##MSG_NUM##</th> + <th>##MSG_ACCESSED_SITE##</th> + <th>##MSG_CONNECT##</th> + <th>##MSG_BYTES##</th> + <th>##MSG_CUMULATIVE##</th> + <th>%</th> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> +<!-- [[ site start--> + <tr ##ROWATTR##> + <td align="center">##NUM##</td> + <td align="left"><A HREF="##SITEURL_L##">##SITEURL_B##</A></td> + <td align="right" nowrap="true">##SITECONNECT##</td> + <td align="right" nowrap="true">##SITEBYTES##</td> + <td align="right" nowrap="true">##SITETOTAL##</td> + <td align="right" nowrap="true">##SITEPERCENT##%</td> + </tr> +<!-- ]] site end--> + + <tr class=total> + <th align="left" >##MSG_TOTAL##</th> + <th align="right"> </th> + <th align="right"> </th> + <th align="right" nowrap="true">##TOTAL##</th> + <th align="right"> </th> + <th align="right"> </th> + </tr> + </tbody> + </table> + + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> +</center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/user_month.html b/config/lightsquid/tpl/novosea/user_month.html new file mode 100755 index 00000000..de7d8cab --- /dev/null +++ b/config/lightsquid/tpl/novosea/user_month.html @@ -0,0 +1,83 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<HTML> +<HEAD> + <META name="robots" content="noindex,nofollow"> + <META name="generator" content="LightSquid - http://lightsquid.sf.net"> + <META http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <TITLE>LightSquid :: User Month detail</TITLE> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</HEAD> + +<BODY background="" bgcolor="white" text="black"> + + <center> + <table class="title"> + <tbody> + <tr class="title"> + <th align="center"><a href="index.cgi"><h1 class="title">##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_USER##: ##USER##</h3></td> + </tr> + <tr> + <td colspan="2" align="center"><h3>##MSG_WORK_PERIOD##: ##WORKPERIOD##</h3></td> + </tr> + <tr> + <TD colspan="2" align="center">##MSG_TOTAL##: ##TOTALBYTES##</TD> + </tr> + <tr> +<!-- HIDE graphreport start--> + <td colspan="2" align="center"><A HREF="##GRAPHURL_L##"><img src="get.cgi?png=graph" border="0" title="Graph Report"> +<!-- HIDE graphreport end--> + </tr> + <tr> + <td colspan="2"> + <table width="100%" class="stat"> + <tbody> + <TR class="stat1"> + <TH>##MSG_DATE##</TH> + <TH>##MSG_BYTES##</TH> + <TH>##MSG_WEEKSUM##</th> + <TH>##MSG_CUMULATIVE##</th> + </TR> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> + <!-- VARIABLE sundayattr bgcolor="bisque" --> + <!-- VARIABLE nooversizedattr color="black" --> + <!-- VARIABLE oversizedattr color="red" --> + + <!-- [[ day start--> + <TR ##DAYATTR##> + <TD align="center"><FONT size="-1"><A HREF="##DAYDATE_L##">##DAYDATE_B##</A></FONT></TD> + <TD align="right" nowrap="true"><FONT size="-1" ##OVERSIZEATTR##>##DAYBYTES##</FONT></TD> + <td align="right" nowrap="true">##WEEKSUM##</td> + <td align="right" nowrap="true"><font size="-2">##DAYCUMULATIVE##</font></td> + </TR> + <!-- ]] day end--> + + <TR class="total"> + <TD align="center">##MSG_TOTAL##</TD> + <TD align="right" nowrap="true"><FONT size="-1">##TOTALBYTES##</FONT></TD> + <td align="right" nowrap="true"> </td> + <td align="right" nowrap="true"> </td> + </TR> + </tbody> + </table> + </td> + </tr> + + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </TBODY> + </TABLE> + </CENTER> +</BODY> +</HTML> diff --git a/config/lightsquid/tpl/novosea/user_time.html b/config/lightsquid/tpl/novosea/user_time.html new file mode 100755 index 00000000..14183006 --- /dev/null +++ b/config/lightsquid/tpl/novosea/user_time.html @@ -0,0 +1,111 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: User Detail by TIME </title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class=title>##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <td colspan="2"><h3>##MSG_USER##: ##USER##</h3></td> + </tr> + + <tr> + <td colspan="2"><h3>##MSG_DATE##: ##WORKPERIOD##</h3></td> + </tr> + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class="stat1"> + <th>##MSG_NUM##</th> + <th>##MSG_ACCESSED_SITE##</th> + <th>00</th> + <th>01</th> + <th>02</th> + <th>03</th> + <th>04</th> + <th>05</th> + <th>06</th> + <th>07</th> + <th>08</th> + <th>09</th> + <th>10</th> + <th>11</th> + <th>12</th> + <th>13</th> + <th>14</th> + <th>15</th> + <th>16</th> + <th>17</th> + <th>18</th> + <th>19</th> + <th>20</th> + <th>21</th> + <th>22</th> + <th>23</th> + <th>##MSG_TOTAL##</th> + </tr> + +<!-- VARIABLE oddattr bgcolor="white" --> +<!-- VARIABLE evenattr bgcolor="#F5F5F5" --> +<!-- VARIABLE totalattr bgcolor=#E5EFF4 --> + +<!-- [[ site start--> + <tr ##ROWATTR##> + <td align="center">##NUM##</td> + <td align="left">##URL##</td> + <td align="center"><font size="-1">##T00##</font></td> + <td align="center"><font size="-1">##T01##</font></td> + <td align="center"><font size="-1">##T02##</font></td> + <td align="center"><font size="-1">##T03##</font></td> + <td align="center"><font size="-1">##T04##</font></td> + <td align="center"><font size="-1">##T05##</font></td> + <td align="center"><font size="-1">##T06##</font></td> + <td align="center"><font size="-1">##T07##</font></td> + <td align="center"><font size="-1">##T08##</font></td> + <td align="center"><font size="-1">##T09##</font></td> + <td align="center"><font size="-1">##T10##</font></td> + <td align="center"><font size="-1">##T11##</font></td> + <td align="center"><font size="-1">##T12##</font></td> + <td align="center"><font size="-1">##T13##</font></td> + <td align="center"><font size="-1">##T14##</font></td> + <td align="center"><font size="-1">##T15##</font></td> + <td align="center"><font size="-1">##T16##</font></td> + <td align="center"><font size="-1">##T17##</font></td> + <td align="center"><font size="-1">##T18##</font></td> + <td align="center"><font size="-1">##T19##</font></td> + <td align="center"><font size="-1">##T20##</font></td> + <td align="center"><font size="-1">##T21##</font></td> + <td align="center"><font size="-1">##T22##</font></td> + <td align="center"><font size="-1">##T23##</font></td> + <td align="right" nowrap="true"><font size="-1">##URLSIZE##</font></td> + </tr> + <!-- ]] site end--> + </tbody> + </table> + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </tr> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/lightsquid/tpl/novosea/whousesite.html b/config/lightsquid/tpl/novosea/whousesite.html new file mode 100755 index 00000000..ffd288f4 --- /dev/null +++ b/config/lightsquid/tpl/novosea/whousesite.html @@ -0,0 +1,86 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- LightSquid TPL v1.7 --> +<html> +<head> + <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="LightSquid - http://lightsquid.sf.net"> + <meta http-equiv="Content-Type" content="text/html; charset=##MSG_CODEPAGE##"> + ##META## + <title>LightSquid :: Who Use Site report</title> + <link rel="stylesheet" media="screen" href="get.cgi?css=screen" type="text/css"> + <link rel="stylesheet" media="print" href="get.cgi?css=print" type="text/css"> +</head> + +<body> + <center> + <table class=title> + <tbody> + <tr class=title> + <th><a href="index.cgi"><h1 class="title">##MSG_HEADER##</h1></a></th> + <TH width="5%"><a href="/"><h1 class=title>Home</h1></a></TH> + </tr> + <tr> + <th colspan="2"><h2>##MSG_USER_WHO_USE_SITE##<br>##SITE##</h2></th> + </tr> + <tr> + <td colspan=2><b>##MSG_WORK_PERIOD##: ##DATE##</b></td> + </tr> + + <tr> + <td colspan="2"> + <table width="100%" class=stat> + <tbody> + <tr class=stat1> + <th align="left" >##MSG_USER##</th> +<!-- HIDE realname start--> + <th>##MSG_REALNAME##</th> +<!-- HIDE realname end--> + <th>##MSG_CONNECT##</th> + <th>##MSG_SIZE##</th> + <!-- HIDE daylist start --> + <th>##MSG_DAYLIST##</th> + <!-- HIDE daylist end --> + </tr> + + <!-- VARIABLE oddattr bgcolor="white" --> + <!-- VARIABLE evenattr bgcolor="#F5F5F5" --> +<!-- [[ who start--> + <tr ##ROWATTR##> + <td align="left" >##WHOUSER##</td> +<!-- HIDE realname start--> + <td align="right" nowrap="true">##REALNAME##</td> +<!-- HIDE realname end--> + <td align="right">##WHOCONNECT##</td> + <td align="right">##WHOSIZE##</td> + <!-- HIDE daylist start --> + <td align="right"><A HREF="##USEDAYURL_L##">##USEDAYURL_B##</A></td> + <!-- HIDE daylist end --> + </tr> + <!-- ]] who end--> + + <tr class=total> + <th align="left">##MSG_TOTAL##</th> +<!-- HIDE realname start--> + <td> </td> +<!-- HIDE realname end--> + <th align="right">##TOTALCONNECT##</th> + <th align="right">##TOTAL##</th> + <!-- HIDE daylist start --> + <th></th> + <!-- HIDE daylist end --> + </tr> + </tbody> + </table> + + </td> + </tr> + <tr> + <td colspan="2"> + ##COPYRIGHT## + </td> + </td> + </tbody> + </table> + </center> +</body> +</html> diff --git a/config/nmap/nmap.inc b/config/nmap/nmap.inc index f66f6be9..632d4b2d 100644 --- a/config/nmap/nmap.inc +++ b/config/nmap/nmap.inc @@ -32,14 +32,14 @@ function nmap_install() { $destination_file = "/usr/local/share/nmap/nmap-mac-prefixes"; $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); switch ($pfs_version) { - case "1.2": - case "2.0": - return null; case "2.1": $source_file = "/usr/pbi/nmap-" . php_uname("m") . "/share/nmap/nmap-mac-prefixes"; break; - default: + case "2.2": $source_file = "/usr/pbi/nmap-" . php_uname("m") . "/local/share/nmap/nmap-mac-prefixes"; + break; + default: + return null; } /* Only copy the file if it doesn't exist */ if (file_exists($source_file) && !file_exists($destination_file)) { diff --git a/config/nut/nut.inc b/config/nut/nut.inc index aa0bbe13..9ba942ab 100644 --- a/config/nut/nut.inc +++ b/config/nut/nut.inc @@ -36,10 +36,10 @@ define('NUT_RCFILE', '/usr/local/etc/rc.d/nut.sh'); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - if ($pfs_version == "2.0") { - define('NUT_DIR','/usr/local/etc/nut'); - } else { + if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('NUT_DIR', '/usr/pbi/nut-' . php_uname("m") . '/etc/nut'); + } else { + define('NUT_DIR','/usr/local/etc/nut'); } function nut_notice ($msg) { syslog(LOG_NOTICE, "nut: {$msg}"); return; } diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc index 5235acde..e36b3e8e 100644 --- a/config/open-vm-tools_2/open-vm-tools.inc +++ b/config/open-vm-tools_2/open-vm-tools.inc @@ -16,7 +16,11 @@ function open_vm_tools_install() { unlink_if_exists("/boot/kernel/vmmemctl.ko"); unlink_if_exists("/boot/kernel/vmxnet.ko"); - $openvmtools_path = "/usr/pbi/open-vm-tools-" . php_uname("m"); + $pfs_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pfs_version == "2.1" || $pfs_version == "2.2") + $openvmtools_path = "/usr/pbi/open-vm-tools-" . php_uname("m"); + else + $openvmtools_path = "/usr/local"; // won't copy this either for now, some sequences of loading/unloading of the module will kernel panic. //exec("cp $openvmtools_path/local/lib/vmware-tools/modules/drivers/vmmemctl.ko /boot/kernel/"); @@ -141,4 +145,4 @@ EOF; } -?>
\ No newline at end of file +?> diff --git a/config/openbgpd/openbgpd.inc b/config/openbgpd/openbgpd.inc index 907f6b8c..c625cff8 100644 --- a/config/openbgpd/openbgpd.inc +++ b/config/openbgpd/openbgpd.inc @@ -33,7 +33,7 @@ require_once("service-utils.inc"); define('PKG_BGPD_CONFIG_BASE', '/var/etc/openbgpd'); $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -if ($pf_version > 2.0) +if ($pf_version == "2.1" || $pf_version == "2.2") define('PKG_BGPD_BIN', '/usr/pbi/openbgpd-' . php_uname("m") . '/sbin'); else define('PKG_BGPD_BIN','/usr/local/sbin'); diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 16ccb6a4..9488119e 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -44,17 +44,20 @@ $current_openvpn_version_rev = "03"; function openvpn_client_export_install() { global $current_openvpn_version; - conf_mount_rw(); - $tarpath = "/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz"; - $phpfile = "vpn_openvpn_export.php"; - $ovpndir = "/usr/local/share/openvpn"; - $workdir = "{$ovpndir}/client-export"; - if (!is_dir($workdir)) - mkdir($workdir, 0777, true); + $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); + if ($pfs_version == "2.1" || $pfs_version == "2.2") { + conf_mount_rw(); + $tarpath = "/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz"; + $ovpndir = "/usr/local/share/openvpn"; + $workdir = "{$ovpndir}/client-export"; - exec("/usr/bin/tar zxf {$tarpath} -C {$ovpndir}"); - conf_mount_ro(); + if (!is_dir($workdir)) + mkdir($workdir, 0777, true); + + exec("/usr/bin/tar zxf {$tarpath} -C {$ovpndir}"); + conf_mount_ro(); + } } function openvpn_client_export_deinstall() { diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml index 42a3c327..47ad4744 100755 --- a/config/openvpn-client-export/openvpn-client-export.xml +++ b/config/openvpn-client-export/openvpn-client-export.xml @@ -28,6 +28,7 @@ <prefix>/usr/local/pkg/</prefix> <chmod>077</chmod> <item>https://files.pfsense.org/packages/openvpn-client-export/openvpn-client-export-2.3.6.tgz</item> + <do_not_add_to_port/> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 18e22871..26eeb5e5 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -2422,10 +2422,8 @@ function pfblockerng_php_install_command() { // Remove previously used CC folder location if exists @rmdir_recursive("{$pfb['dbdir']}/cc"); - # Uncompress Country Code File and delete Archive after extraction. - @rename("{$pfb['dbdir']}/countrycodes.tar.bz2", "{$pfb['ccdir']}/countrycodes.tar.bz2"); - exec("cd {$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2"); - unlink_if_exists("{$pfb['ccdir']}/countrycodes.tar.bz2"); + # Uncompress Country Code File + exec("/usr/bin/tar -jx -C {$pfb['ccdir']} -f {$pfb['dbdir']}/countrycodes.tar.bz2"); # Download MaxMind Files and Create Country Code files and Build Continent XML Files update_output_window(gettext("Downloading MaxMind Country Databases. This may take a minute...")); exec("/bin/sh /usr/local/pkg/pfblockerng/geoipupdate.sh all >> {$pfb['geolog']} 2>&1"); diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml index 6f7e34ec..67deab8d 100644 --- a/config/pfblockerng/pfblockerng.xml +++ b/config/pfblockerng/pfblockerng.xml @@ -49,7 +49,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>pfblockerng</name> - <version>1.0</version> + <version>1.08</version> <title>pfBlockerNG: General Settings</title> <include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file> <menu> @@ -493,4 +493,4 @@ $pfb['save'] = TRUE; sync_package_pfblockerng(); </custom_php_resync_config_command> -</packagegui>
\ No newline at end of file +</packagegui> diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index e2b5c7df..fd0832ba 100755 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -766,6 +766,8 @@ MASTEREOF2; } if (!file_exists("/etc/mail/aliases")) touch("/etc/mail/aliases"); + if (!file_exists("/etc/aliases")) + @symlink("/etc/mail/aliases", "/etc/aliases"); exec("/usr/local/bin/newaliases"); postfix_start(); @@ -846,6 +848,7 @@ function postfix_php_deinstall_command() { sync_package_postfix(); conf_mount_rw(); unlink_if_exists("/usr/local/etc/rc.d/postfix.sh"); + unlink_if_exists("/etc/aliases"); conf_mount_ro(); } diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index 2788dab9..ce2617e1 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -32,7 +32,7 @@ */ /* ========================================================================== */ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -if ($pf_version > 2.0){ +if ($pf_version == "2.1" || $pf_version == "2.2"){ // Function to get squidGuard directory // each squidGuard version has a different directory diff --git a/config/sarg/sarg_realtime.php b/config/sarg/sarg_realtime.php index c5d926e5..f7618d1a 100755 --- a/config/sarg/sarg_realtime.php +++ b/config/sarg/sarg_realtime.php @@ -28,7 +28,7 @@ */ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -if ($pf_version > 2.0) +if ($pf_version == "2.1" || $pf_version == "2.2") define('SARG_DIR', '/usr/pbi/sarg-' . php_uname("m")); else define('SARG_DIR', '/usr/local'); diff --git a/config/siproxd/siproxd.inc b/config/siproxd/siproxd.inc index d9830fb2..e873e08d 100644 --- a/config/siproxd/siproxd.inc +++ b/config/siproxd/siproxd.inc @@ -33,10 +33,10 @@ require_once("service-utils.inc"); // Check to find out on which system the package is running $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); -if ($pfs_version == "2.0") { - define('SIPROXD', '/usr/local'); -} else { +if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('SIPROXD', '/usr/pbi/siproxd-' . php_uname("m")); +} else { + define('SIPROXD', '/usr/local'); } // End of system check diff --git a/config/siproxd/siproxd.xml b/config/siproxd/siproxd.xml index 8b1b5856..455fca9c 100644 --- a/config/siproxd/siproxd.xml +++ b/config/siproxd/siproxd.xml @@ -37,7 +37,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>siproxdsettings</name> - <version>0.8.0_2 pkg v1.0.2</version> + <version>1.0.3</version> <title>siproxd: Settings</title> <include_file>/usr/local/pkg/siproxd.inc</include_file> <aftersaveredirect>/pkg_edit.php?xml=siproxd.xml&id=0</aftersaveredirect> diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index 551ca542..99907451 100644 --- a/config/squidGuard/squidguard_configurator.inc +++ b/config/squidGuard/squidguard_configurator.inc @@ -121,7 +121,7 @@ define('REDIRECT_URL_ARGS', '&a=%a&n=%n&i=%i&s=%s&t=%t&u=%u'); # ------------------------------------------------------------------------------ -if ($pf_version > 2.0) { +if ($pf_version == "2.0" || $pf_version == "2.2") { if (file_exists('/usr/pbi/squidguard-squid3-' . php_uname("m"))) define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-squid3-' . php_uname("m")); else @@ -129,10 +129,12 @@ if ($pf_version > 2.0) { } else define('SQUIDGUARD_LOCALBASE','/usr/local'); -if (!defined('SQUID_LOCALBASE') && ($pf_version > 2.0)) - define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m")); -elseif (!defined('SQUID_LOCALBASE')) - define('SQUID_LOCALBASE','/usr/local'); +if (!defined('SQUID_LOCALBASE')) { + if ($pf_version == "2.0" || $pf_version == "2.2") + define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m")); + else + define('SQUID_LOCALBASE','/usr/local'); +} define('SQUID_CONFIGFILE', SQUID_LOCALBASE . '/etc/squid/squid.conf'); define('TMP_DIR', '/var/tmp'); diff --git a/config/sudo/sudo.inc b/config/sudo/sudo.inc index a8107029..1c07984d 100644 --- a/config/sudo/sudo.inc +++ b/config/sudo/sudo.inc @@ -31,11 +31,6 @@ require_once("config.inc"); global $pfs_version; $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); switch ($pfs_version) { - case "1.2": - case "2.0": - define('SUDO_BASE','/usr/local'); - define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo'); - break; case "2.1": // Hackish way to detect if someone manually did pkg_add rather than use pbi. if (is_dir('/usr/pbi/sudo-' . php_uname("m"))) { @@ -46,7 +41,7 @@ switch ($pfs_version) { define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo'); } break; - default: + case "2.2": define('SUDO_BASE','/usr/local'); // Hackish way to detect if someone manually did pkg_add rather than use pbi. if (is_dir('/usr/pbi/sudo-' . php_uname("m"))) { @@ -54,6 +49,10 @@ switch ($pfs_version) { } else { define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo'); } + break; + default: + define('SUDO_BASE','/usr/local'); + define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo'); } define('SUDO_CONFIG_DIR', SUDO_BASE . '/etc'); diff --git a/config/suricata/suricata_defs.inc b/config/suricata/suricata_defs.inc index 7758a9f0..5467f88c 100644 --- a/config/suricata/suricata_defs.inc +++ b/config/suricata/suricata_defs.inc @@ -58,9 +58,14 @@ $suricata_package_version = "Suricata {$config['installedpackages']['package'][g if (!defined('SURICATA_PKG_VER')) define('SURICATA_PKG_VER', $suricata_package_version); +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); // Define the PBI base directory -if (!defined('SURICATA_PBI_BASEDIR')) - define('SURICATA_PBI_BASEDIR', '/usr/pbi/suricata-' . php_uname("m") . '/'); +if (!defined('SURICATA_PBI_BASEDIR')) { + if ($pf_version == "2.1" || $pf_version == "2.2") + define('SURICATA_PBI_BASEDIR', '/usr/pbi/suricata-' . php_uname("m") . '/'); + else + define('SURICATA_PBI_BASEDIR', '/usr/local/'); +} // Define the PBI binary wrapper directory if (!defined('SURICATA_PBI_BINDIR')) diff --git a/config/varnish3/varnish.inc b/config/varnish3/varnish.inc index 50b37990..5df8052b 100644 --- a/config/varnish3/varnish.inc +++ b/config/varnish3/varnish.inc @@ -35,7 +35,7 @@ $shortcut_section = "varnish"; $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); -if (is_dir('/usr/pbi/varnish-' . php_uname("m"))) { +if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('VARNISH_LOCALBASE', '/usr/pbi/varnish-' . php_uname("m")); } else { define('VARNISH_LOCALBASE','/usr/local'); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 8770843f..c9713b30 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -125,7 +125,7 @@ <category>Firewall</category> <pkginfolink>https://forum.pfsense.org/index.php?topic=86212.0</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.xml</config_file> - <version>1.06</version> + <version>1.08</version> <status>Stable</status> <required_version>2.2</required_version> <maintainer>BBCan177@gmail.com</maintainer> @@ -464,7 +464,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/postfix/postfix.xml</config_file> <depends_on_package_pbi>postfix-2.11.3_2-##ARCH##.pbi</depends_on_package_pbi> - <version>2.4.1</version> + <version>2.4.2</version> <status>Release</status> <required_version>2.2</required_version> <configurationfile>postfix.xml</configurationfile> @@ -530,10 +530,12 @@ <config_file>https://packages.pfsense.org/packages/config/siproxd/siproxd.xml</config_file> <depends_on_package_pbi>siproxd-0.8.0_1-##ARCH##.pbi</depends_on_package_pbi> <pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink> + <port_category>net</port_category> + <run_depends>sbin/siproxd:net/siproxd</run_depends> <build_pbi> <port>net/siproxd</port> </build_pbi> - <version>0.8.0_1 pkg v1.0.3</version> + <version>1.0.3</version> <status>Beta</status> <required_version>2.2</required_version> <configurationfile>siproxd.xml</configurationfile> @@ -543,10 +545,13 @@ <descr>OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol. -- WARNING! Installs files to the same place as Quagga OSPF. Installing both will result in a broken state, remove this package before installing Quagga OSPF.</descr> <category>NET</category> <config_file>https://packages.pfsense.org/packages/config/openbgpd/openbgpd.xml</config_file> + <port_category>net</port_category> + <run_depends>sbin/bgpctl:net/openbgpd</run_depends> + <conflicts>Quagga_OSPF</conflicts> <build_pbi> <port>net/openbgpd</port> </build_pbi> - <version>0.9.3_1</version> + <version>0.9.3_2</version> <status>STABLE</status> <pkginfolink>https://doc.pfsense.org/index.php/OpenBGPD_package</pkginfolink> <required_version>2.2</required_version> @@ -558,8 +563,10 @@ <descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr> <website>http://lightsquid.sf.net/</website> <category>Network Report</category> - <version>1.8.2 pkg v.2.36</version> + <version>2.39</version> <maintainer>dv_serg@mail.ru</maintainer> + <port_category>www</port_category> + <run_depends>libexec/lightsquid/ip2name.list:www/lightsquid</run_depends> <depends_on_package_pbi>lightsquid-1.8_2-##ARCH##.pbi</depends_on_package_pbi> <build_pbi> <ports_before>graphics/gd graphics/p5-GD</ports_before> @@ -582,9 +589,11 @@ <config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file> <pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> <depends_on_package_pbi>sarg-2.3.9-##ARCH##.pbi</depends_on_package_pbi> - <version>2.3.9 pkg v.0.6.4</version> + <version>0.6.4</version> <status>Release</status> <required_version>2.2</required_version> + <port_category>www</port_category> + <run_depends>bin/sarg:www/sarg</run_depends> <configurationfile>sarg.xml</configurationfile> <build_pbi> <port>www/sarg</port> @@ -603,10 +612,12 @@ <config_file>https://packages.pfsense.org/packages/config/ipguard/ipguard.xml</config_file> <pkginfolink>https://forum.pfsense.org/index.php/topic,49917.msg263664.html#msg263664</pkginfolink> <depends_on_package_pbi>ipguard-1.04_2-##ARCH##.pbi</depends_on_package_pbi> - <version>1.0.4_2 pkg v.0.1</version> + <version>0.1</version> <status>beta</status> <required_version>2.2</required_version> <configurationfile>ipguard.xml</configurationfile> + <port_category>security</port_category> + <run_depends>sbin/ipguard:security/ipguard</run_depends> <build_pbi> <port>security/ipguard</port> </build_pbi> @@ -621,12 +632,14 @@ <website>http://varnish-cache.org</website> <pkginfolink>https://doc.pfsense.org/index.php/Varnish_package</pkginfolink> <category>Services</category> - <version>3.0.5_3 pkg v.0.2.4</version> + <version>0.2.4</version> <status>RC</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/varnish3/varnish_backends.xml</config_file> <configurationfile>varnish_backends.xml</configurationfile> <depends_on_package_pbi>varnish-3.0.5_3-##ARCH##.pbi</depends_on_package_pbi> + <port_category>www</port_category> + <run_depends>bin/varnishadm:www/varnish</run_depends> <build_pbi> <port>www/varnish</port> <ports_after>lang/gcc</ports_after> @@ -640,10 +653,12 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,14179.0.html</pkginfolink> <category>Network Management</category> <depends_on_package_pbi>vnstat-1.12-##ARCH##.pbi</depends_on_package_pbi> + <port_category>net</port_category> + <run_depends>bin/vnstat:net/vnstat</run_depends> <build_pbi> <port>net/vnstat</port> </build_pbi> - <version>1.12,3</version> + <version>1.12_3</version> <status>Stable</status> <required_version>2.2</required_version> <maintainer>crazypark2@yahoo.dk</maintainer> @@ -662,6 +677,8 @@ <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/tinydns/tinydns.xml</config_file> <configurationfile>tinydns.xml</configurationfile> + <port_category>dns</port_category> + <run_depends>bin/dnsq:dns/djbdns</run_depends> <depends_on_package_pbi>djbdns-1.05_20-##ARCH##.pbi</depends_on_package_pbi> <build_pbi> <ports_before>sysutils/ucspi-tcp sysutils/daemontools</ports_before> @@ -674,12 +691,14 @@ <descr>VMware Tools</descr> <website>http://open-vm-tools.sourceforge.net/</website> <category>Services</category> - <version>1280544_9_4</version> + <version>1280544_10</version> <status>Stable</status> <pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/open-vm-tools_2/open-vm-tools.xml</config_file> <configurationfile>open-vm-tools.xml</configurationfile> + <port_category>emulators</port_category> + <run_depends>bin/vmtoolsd:emulators/open-vm-tools-nox11</run_depends> <build_pbi> <port>emulators/open-vm-tools-nox11</port> </build_pbi> @@ -703,12 +722,14 @@ <descr>Broadcasts a who-has ARP packet on the network and prints answers. </descr> <website>http://www.habets.pp.se/synscan/programs.php?prog=arping</website> <category>Services</category> - <version>2.14_1 v1.1</version> + <version>1.1</version> <status>Stable</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/arping/arping.xml</config_file> <configurationfile>arping.xml</configurationfile> <depends_on_package_pbi>arping-2.14_1-##ARCH##.pbi</depends_on_package_pbi> + <port_category>net</port_category> + <run_depends>sbin/arping:net/arping</run_depends> <build_pbi> <port>net/arping</port> </build_pbi> @@ -721,11 +742,13 @@ <category>Security</category> <depends_on_package_pbi>nmap-6.47-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file> - <version>nmap-6.47 pkg v1.3</version> + <version>1.3</version> <status>Stable</status> <pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink> <required_version>2.2</required_version> <configurationfile>nmap.xml</configurationfile> + <port_category>security</port_category> + <run_depends>bin/nmap:security/nmap</run_depends> <build_pbi> <port>security/nmap</port> </build_pbi> @@ -736,7 +759,7 @@ <website>http://www.imspector.org/</website> <category>Network Management</category> <maintainer>marcellocoutinho@gmail.com</maintainer> - <version>20111108_2 pkg v 0.3.2</version> + <version>0.3.2</version> <required_version>2.2</required_version> <status>BETA</status> <pkginfolink>https://doc.pfsense.org/index.php/IMSpector_package</pkginfolink> @@ -744,6 +767,8 @@ <configurationfile>imspector.xml</configurationfile> <depends_on_package_pbi>imspector-20111108_2-##ARCH##.pbi</depends_on_package_pbi> <build_options>imspector_SET_FORCE=PLUGINS;imspector_UNSET_FORCE=IPFW</build_options> + <port_category>net-im</port_category> + <run_depends>sbin/imspector:net-im/imspector</run_depends> <build_pbi> <port>net-im/imspector</port> </build_pbi> @@ -753,13 +778,14 @@ <descr>Network UPS Tools</descr> <website>http://www.networkupstools.org/</website> <category>Network Management</category> - <version>2.7.2_6 pkg 2.0.4</version> + <version>2.0.4</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>rswagoner@gmail.com</maintainer> <config_file>https://packages.pfsense.org/packages/config/nut/nut.xml</config_file> <configurationfile>nut.xml</configurationfile> <depends_on_package_pbi>nut-2.7.2_6-##ARCH##.pbi</depends_on_package_pbi> + <run_depends>bin/upsc:sysutils/nut</run_depends> <build_pbi> <port>sysutils/nut</port> </build_pbi> @@ -786,9 +812,11 @@ <version>3.0.718</version> <status>Stable</status> <required_version>2.2</required_version> - <maintainer>sullrich+pfsp@gmail.com</maintainer> + <maintainer>coreteam@pfsense.org</maintainer> <config_file>https://packages.pfsense.org/packages/config/darkstat/darkstat.xml</config_file> <configurationfile>darkstat.xml</configurationfile> + <port_category>net-mgmt</port_category> + <run_depends>sbin/darkstat:net-mgmt/darkstat</run_depends> <build_pbi> <port>net-mgmt/darkstat</port> </build_pbi> @@ -800,11 +828,12 @@ <category>Network Management</category> <config_file>https://packages.pfsense.org/packages/config/pfflowd/pfflowd.xml</config_file> <depends_on_package_pbi>pfflowd-0.8-##ARCH##.pbi</depends_on_package_pbi> - <version>0.8 pkg v1.0.2</version> + <version>1.0.2</version> <status>Stable</status> <required_version>2.2</required_version> <configurationfile>pfflowd.xml</configurationfile> - <maintainer></maintainer> + <port_category>net</port_category> + <run_depends>sbin/pfflowd:net/pfflowd-0.8</run_depends> <build_pbi> <custom_name>pfflowd</custom_name> <port>net/pfflowd-0.8</port> @@ -822,6 +851,8 @@ <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/widentd/widentd.xml</config_file> <configurationfile>widentd.xml</configurationfile> + <port_category>net</port_category> + <run_depends>sbin/widentd:net/widentd</run_depends> <build_pbi> <port>net/widentd</port> </build_pbi> @@ -835,7 +866,7 @@ On pfSense docs there is a how-to which could help you on porting users.]]></descr> <pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink> <category>System</category> - <version>2.2.6_3 pkg v1.6.11</version> + <version>1.6.12</version> <status>RC1</status> <required_version>2.2</required_version> <maintainer>nachtfalkeaw@web.de</maintainer> @@ -843,7 +874,8 @@ <config_file>https://packages.pfsense.org/packages/config/freeradius2/freeradius.xml</config_file> <configurationfile>freeradius.xml</configurationfile> <after_install_info>Please visit Services: FreeRADIUS</after_install_info> - <!-- Try to use the new PBI build syntax here, it may help it pick up the right libs inside the single PBI rather than using multiple. --> + <port_category>net</port_category> + <run_depends>sbin/radiusd:net/freeradius2 bin/bash:shells/bash</run_depends> <build_pbi> <ports_before>security/krb5</ports_before> <port>net/freeradius2</port> @@ -856,12 +888,15 @@ <website>http://bandwidthd.sourceforge.net/</website> <descr>BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded.</descr> <category>System</category> - <version>2.0.1_6 pkg v.0.5</version> + <version>0.5</version> <status>BETA</status> <required_version>2.2</required_version> <depends_on_package_pbi>bandwidthd-2.0.1_6-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/bandwidthd/bandwidthd.xml</config_file> <configurationfile>bandwidthd.xml</configurationfile> + <port_category>net-mgmt</port_category> + <port_uses>USES=pgsql</port_uses> + <run_depends>bandwidthd/bandwidthd:net-mgmt/bandwidthd</run_depends> <build_pbi> <ports_before>net/libpcap databases/postgresql91-client graphics/gd</ports_before> <port>net-mgmt/bandwidthd</port> @@ -880,6 +915,8 @@ <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/stunnel/stunnel.xml</config_file> <configurationfile>stunnel.xml</configurationfile> + <port_category>security</port_category> + <run_depends>bin/stunnel:security/stunnel</run_depends> <build_pbi> <port>security/stunnel</port> </build_pbi> @@ -897,6 +934,8 @@ <pkginfolink>https://doc.pfsense.org/index.php/Iperf_package</pkginfolink> <required_version>2.2</required_version> <configurationfile>iperf.xml</configurationfile> + <port_category>benchmarks</port_category> + <run_depends>bin/iperf:benchmarks/iperf</run_depends> <build_pbi> <port>benchmarks/iperf</port> </build_pbi> @@ -912,6 +951,8 @@ <required_version>2.2</required_version> <status>ALPHA</status> <configurationfile>netio.xml</configurationfile> + <port_category>benchmarks</port_category> + <run_depends>bin/netio:benchmarks/netio</run_depends> <build_pbi> <port>benchmarks/netio</port> </build_pbi> @@ -923,11 +964,13 @@ <website>http://www.bitwizard.nl/mtr/</website> <category>Network Management</category> <depends_on_package_pbi>mtr-0.85_1-##ARCH##.pbi</depends_on_package_pbi> - <version>0.85_1.1</version> + <version>0.85_2</version> <status>Stable</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/mtr-nox11/mtr-nox11.xml</config_file> <configurationfile>mtr-nox11.xml</configurationfile> + <port_category>net</port_category> + <run_depends>sbin/mtr:net/mtr-nox11</run_depends> <build_pbi> <port>net/mtr</port> </build_pbi> @@ -980,17 +1023,21 @@ <descr>LCD display driver</descr> <website>http://www.lcdproc.org/</website> <category>Utility</category> - <version>lcdproc-0.5.7_2 pkg.v.1.0.2</version> + <version>1.0.2</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>seth.mos@dds.nl</maintainer> <depends_on_package_pbi>lcdproc-0.5.7_2-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/lcdproc/lcdproc.xml</config_file> <configurationfile>lcdproc.xml</configurationfile> + <port_category>sysutils</port_category> + <run_depends>bin/lcdproc:sysutils/lcdproc</run_depends> + <conflicts>LCDproc-dev</conflicts> <build_pbi> <port>sysutils/lcdproc</port> </build_pbi> <build_options>lcdproc_SET_FORCE=USB</build_options> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>LCDproc-dev</name> @@ -998,7 +1045,7 @@ <descr>LCD display driver - Development version</descr> <website>http://www.lcdproc.org/</website> <category>Utility</category> - <version>lcdproc-0.5.7_2 pkg v. 0.9.11</version> + <version>0.9.11</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>michele@nt2.it</maintainer> @@ -1006,6 +1053,9 @@ <depends_on_package_pbi>lcdproc-0.5.7_2-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/lcdproc-dev/lcdproc.xml</config_file> <configurationfile>lcdproc.xml</configurationfile> + <port_category>sysutils</port_category> + <run_depends>bin/lcdproc:sysutils/lcdproc</run_depends> + <conflicts>LCDproc</conflicts> <build_pbi> <port>sysutils/lcdproc</port> </build_pbi> @@ -1030,6 +1080,7 @@ <facilityname>arpwatch</facilityname> <logfilename>arpwatch.log</logfilename> </logging> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>squidGuard</name> @@ -1037,12 +1088,14 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_7 pkg v.1.9.14</version> + <version>1.9.14</version> <status>Beta</status> <required_version>2.2</required_version> <depends_on_package_pbi>squidguard-1.4_7-##ARCH##.pbi</depends_on_package_pbi> + <port_category>www</port_category> + <run_depends>bin/squidGuard:www/squidguard</run_depends> <build_pbi> - <ports_before>www/squid33 databases/db5 security/cyrus-sasl2</ports_before> + <ports_before>www/squid databases/db5 security/cyrus-sasl2</ports_before> <port>www/squidguard</port> </build_pbi> <build_options>squidGuard_UNSET_FORCE=QUOTE_STRING;squidGuard_SET_FORCE=DNS_BL LDAP STRIP_NTDOMAIN;c-icap_UNSET_FORCE=IPV6;squid_UNSET_FORCE=AUTH_SMB AUTH_SQL DNS_HELPER FS_COSS ESI SNMP ECAP STACKTRACES STRICT_HTTP TP_IPF TP_IPFW VIA_DB DEBUG;squid_SET_FORCE=ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF TP_PF MSSL_CRTD WCCP WCCPV2 FS_AUFS HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE SSL SSL_CRTD</build_options> @@ -1067,14 +1120,18 @@ <build_options>squidGuard-devel_UNSET_FORCE=SQUID32 SQUID33;squidGuard-devel_SET_FORCE=LDAP STRIPNT SQUID27;squid_UNSET_FORCE=DNS_HELPER IPFILTER PINGER STACKTRACES STRICT_HTTP_DESC USERAGENT_LOG WCCPV2;squid_SET_FORCE=PF LDAP_AUTH NIS_AUTH SASL_AUTH ARP_ACL AUFS CACHE_DIGESTS CARP COSS DELAY_POOLS FOLLOW_XFF HTCP IDENT KERB_AUTH KQUEUE LARGEFILE REFERER_LOG SNMP SSL VIA_DB WCCP;SQUID_UID=proxy;SQUID_GID=proxy</build_options> <config_file>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard.xml</config_file> <configurationfile>squidguard.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>OpenVPN Client Export Utility</name> + <internal_name>openvpn-client-export</internal_name> <descr>Allows a pre-configured OpenVPN Windows Client or Mac OSX's Viscosity configuration bundle to be exported directly from pfSense.</descr> <category>Security</category> <depends_on_package_pbi>zip-3.0_1-##ARCH##.pbi p7zip-9.20.1_2-##ARCH##.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> + <port_category>security</port_category> + <run_depends>share/openvpn/client-export/template/config-import:security/openvpn-client-export bin/zip:archivers/zip bin/7z:archivers/p7zip</run_depends> <version>1.2.16</version> <status>RELEASE</status> <required_version>2.2</required_version> @@ -1100,6 +1157,7 @@ <configurationfile>havp.xml</configurationfile> <maintainer>dv_serg@mail.ru</maintainer> <after_install_info>Please check the HAVP settings.</after_install_info> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>blinkled</name> @@ -1113,6 +1171,8 @@ <configurationfile>blinkled.xml</configurationfile> <pkginfolink>https://doc.pfsense.org/index.php/BlinkLED_Package</pkginfolink> <website>https://doc.pfsense.org/index.php/BlinkLED_Package</website> + <port_category>sysutils</port_category> + <run_depends>bin/blinkled:sysutils/blinkled</run_depends> <build_pbi> <port>sysutils/blinkled</port> </build_pbi> @@ -1125,6 +1185,7 @@ <version>0.2.1</version> <status>Beta</status> <maintainer>jimp@pfsense.org</maintainer> + <port_category>sysutils</port_category> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/gwled/gwled.xml</config_file> <configurationfile>gwled.xml</configurationfile> @@ -1138,6 +1199,7 @@ <status>BETA</status> <required_version>2.2</required_version> <configurationfile>widget-havp.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>Dashboard Widget: Antivirus Status</name> @@ -1148,14 +1210,17 @@ <status>BETA</status> <required_version>2.2</required_version> <configurationfile>widget-havp.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>RRD Summary</name> + <internal_name>RRD_Summary</internal_name> <descr>RRD Summary Page, which will give a total amount of traffic passed In/Out during this and the previous month.</descr> <category>System</category> <version>1.1</version> <status>Beta</status> <maintainer>jimp@pfsense.org</maintainer> + <port_category>sysutils</port_category> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/rrd-summary/rrd-summary.xml</config_file> <configurationfile>rrd-summary.xml</configurationfile> @@ -1190,6 +1255,7 @@ <required_version>2.2</required_version> <maintainer>erik@erikkristensen.com</maintainer> <configurationfile>nrpe2.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>Check_mk agent</name> @@ -1207,6 +1273,7 @@ <required_version>2.2</required_version> <maintainer>marcellocoutinho@gmail.com</maintainer> <configurationfile>checkmk.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>SSHDCond</name> @@ -1219,6 +1286,7 @@ <config_file>https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml</config_file> <maintainer>namezero@afim.info</maintainer> <configurationfile>sshdcond.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>mailreport</name> @@ -1226,19 +1294,24 @@ <category>Network Management</category> <version>2.3</version> <status>Stable</status> + <port_category>mail</port_category> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file> <configurationfile>mailreport.xml</configurationfile> </package> <package> <name>Quagga OSPF</name> + <internal_name>Quagga_OSPF</internal_name> <descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.</descr> <maintainer>jimp@pfsense.org</maintainer> - <version>0.99.22.3.1_2 v0.6.5</version> + <version>0.6.5</version> <category>Routing</category> <status>BETA</status> <depends_on_package_pbi>quagga-0.99.23.1_2-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/quagga_ospfd/quagga_ospfd.xml</config_file> + <port_category>net</port_category> + <run_depends>sbin/watchquagga:net/quagga</run_depends> + <conflicts>OpenBGPD</conflicts> <build_pbi> <port>net/quagga</port> </build_pbi> @@ -1248,12 +1321,14 @@ </package> <package> <name>System Patches</name> + <internal_name>System_Patches</internal_name> <descr>A package to apply and maintain custom system patches.</descr> <maintainer>jimp@pfsense.org</maintainer> <version>1.0.3</version> <category>System</category> <status>RELEASE</status> <config_file>https://packages.pfsense.org/packages/config/systempatches/systempatches.xml</config_file> + <port_category>sysutils</port_category> <pkginfolink></pkginfolink> <required_version>2.2</required_version> <configurationfile>systempatches.xml</configurationfile> @@ -1275,9 +1350,9 @@ <maintainer>marcioc.antao@gmail.com</maintainer> <configurationfile>bacula-client.xml</configurationfile> <after_install_info>Please visit the bacula client tab on services menu.</after_install_info> + <maximum_version>2.2.999</maximum_version> </package> <package> - <!-- This does not exist yet, this is here to trigger a PBI build --> <name>urlsnarf</name> <pkginfolink>https://forum.pfsense.org/</pkginfolink> <descr><![CDATA[HTTP URL Sniffer (console/shell only)]]></descr> @@ -1293,9 +1368,9 @@ <port>security/dsniff</port> </build_pbi> <depends_on_package_pbi>dsniff-2.4b1-##ARCH##.pbi</depends_on_package_pbi> + <maximum_version>2.2.999</maximum_version> </package> <package> - <!-- This does not exist yet, this is here to trigger a PBI build --> <name>iftop</name> <pkginfolink>https://forum.pfsense.org/</pkginfolink> <descr><![CDATA[Realtime interface monitor (console/shell only)]]></descr> @@ -1306,13 +1381,14 @@ <config_file>https://packages.pfsense.org/packages/config/iftop/iftop.xml</config_file> <maintainer>jimp@pfsense.org</maintainer> <configurationfile>iftop.xml</configurationfile> + <port_category>net-mgmt</port_category> + <run_depends>sbin/iftop:net-mgmt/iftop</run_depends> <build_pbi> <port>net-mgmt/iftop</port> </build_pbi> <depends_on_package_pbi>iftop-0.17-##ARCH##.pbi</depends_on_package_pbi> </package> <package> - <!-- This does not exist yet, this is here to trigger a pkg build --> <name>git</name> <pkginfolink>https://forum.pfsense.org/</pkginfolink> <descr><![CDATA[GIT Source Code Management (console/shell only)]]></descr> @@ -1324,6 +1400,8 @@ <maintainer>jimp@pfsense.org</maintainer> <configurationfile>git.xml</configurationfile> <build_options>git_UNSET_FORCE=GITWEB GUI HTMLDOCS CVS P4 SVN;git_SET_FORCE=CONTRIB CURL ETCSHELLS ICONV NLS PERL</build_options> + <port_category>devel</port_category> + <run_depends>bin/git:devel/git-lite</run_depends> <build_pbi> <port>devel/git</port> </build_pbi> @@ -1349,6 +1427,7 @@ <logfilename>tinc.log</logfilename> <logtab>tinc</logtab> </logging> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>syslog-ng</name> @@ -1366,6 +1445,7 @@ <maintainer>laleger@gmail.com</maintainer> <config_file>https://packages.pfsense.org/packages/config/syslog-ng/syslog-ng.xml</config_file> <configurationfile>syslog-ng.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>Zabbix Agent LTS</name> @@ -1385,6 +1465,7 @@ <port>net-mgmt/zabbix22-agent</port> </build_pbi> <depends_on_package_pbi>zabbix22-agent-2.2.7-##ARCH##.pbi</depends_on_package_pbi> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>Zabbix Proxy LTS</name> @@ -1405,6 +1486,7 @@ </build_pbi> <build_options>zabbix22_SET_FORCE=SQLITE IPV6;zabbix22_UNSET_FORCE=MYSQL JABBER GSSAPI</build_options> <depends_on_package_pbi>zabbix22-proxy-2.2.7-##ARCH##.pbi</depends_on_package_pbi> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>Zabbix-2 Agent</name> @@ -1425,6 +1507,7 @@ <port>net-mgmt/zabbix24-agent</port> </build_pbi> <depends_on_package_pbi>zabbix24-agent-2.4.3-##ARCH##.pbi</depends_on_package_pbi> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>Zabbix-2 Proxy</name> @@ -1446,6 +1529,7 @@ </build_pbi> <build_options>zabbix24_SET_FORCE=SQLITE IPV6;zabbix24_UNSET_FORCE=MYSQL JABBER GSSAPI</build_options> <depends_on_package_pbi>zabbix24-proxy-2.4.3-##ARCH##.pbi</depends_on_package_pbi> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>sudo</name> @@ -1458,6 +1542,8 @@ <config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file> <maintainer>jimp@pfsense.org</maintainer> <configurationfile>sudo.xml</configurationfile> + <port_category>security</port_category> + <run_depends>bin/sudo:security/sudo</run_depends> <build_pbi> <port>security/sudo</port> </build_pbi> @@ -1465,6 +1551,7 @@ </package> <package> <name>Service Watchdog</name> + <internal_name>Service_Watchdog</internal_name> <descr>Monitors for stopped services and restarts them.</descr> <maintainer>jimp@pfsense.org</maintainer> <version>1.6</version> @@ -1482,11 +1569,13 @@ <category>Network Management</category> <config_file>https://packages.pfsense.org/packages/config/softflowd/softflowd.xml</config_file> <depends_on_package_pbi>softflowd-0.9.8_2-##ARCH##.pbi</depends_on_package_pbi> - <version>0.9.8_2 pkg v1.1</version> + <version>1.1</version> <status>Beta</status> <required_version>2.2</required_version> <configurationfile>softflowd.xml</configurationfile> <maintainer></maintainer> + <port_category>net-mgmt</port_category> + <run_depends>sbin/softflowd:net-mgmt/softflowd</run_depends> <build_pbi> <port>net-mgmt/softflowd</port> </build_pbi> @@ -1507,6 +1596,7 @@ </build_pbi> <build_options>apcupsd_SET_FORCE=APCSMART_DRV APCDUMB_DRV PCNET_DRV USB TCP_WRAPPERS SNMP_DRV;apcupsd_UNSET_FORCE=CLIENT_ONLY CGI SNMP_DRV_OLD TEST_DRV GAPCMON</build_options> <depends_on_package_pbi>apcupsd-3.14.12_1-##ARCH##.pbi</depends_on_package_pbi> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>LADVD</name> @@ -1523,17 +1613,20 @@ <pkginfolink></pkginfolink> <required_version>2.2</required_version> <configurationfile>ladvd.xml</configurationfile> + <maximum_version>2.2.999</maximum_version> </package> <package> <name>suricata</name> <website>http://suricata-ids.org/</website> <descr><![CDATA[High Performance Network IDS, IPS and Security Monitoring engine by OISF.]]></descr> <category>Security</category> - <version>2.0.6 pkg v2.1.4</version> + <version>2.1.4</version> <status>Stable</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file> <configurationfile>suricata.xml</configurationfile> + <port_category>security</port_category> + <run_depends>bin/suricata:security/suricata</run_depends> <build_pbi> <port>security/suricata</port> <ports_after>security/barnyard2</ports_after> @@ -1543,11 +1636,13 @@ </package> <package> <name>FTP Client Proxy</name> + <internal_name>FTP_Client_Proxy</internal_name> <descr><![CDATA[Basic FTP Client Proxy using ftp-proxy from FreeBSD]]></descr> <maintainer>jimp@pfsense.org</maintainer> <version>0.2</version> <category>Services</category> <status>Beta</status> + <port_category>ftp</port_category> <config_file>https://packages.pfsense.org/packages/config/ftpproxy/ftpproxy.xml</config_file> <required_version>2.2</required_version> <configurationfile>ftpproxy.xml</configurationfile> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index b8fb6dbb..2b80b127 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -665,7 +665,7 @@ <descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr> <website>http://lightsquid.sf.net/</website> <category>Network Report</category> - <version>1.8.2 pkg v.2.35</version> + <version>2.39</version> <maintainer>dv_serg@mail.ru</maintainer> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> <depends_on_package>lightsquid-1.8_2.tbz</depends_on_package> @@ -1041,7 +1041,7 @@ On pfSense docs there is a how-to which could help you on porting users.]]></descr> <pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink> <category>System</category> - <version>2.2.5_3 pkg v1.6.11</version> + <version>1.6.12</version> <status>RC1</status> <required_version>2.1</required_version> <maintainer>nachtfalkeaw@web.de</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 7e12d7d0..8e821af7 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -652,7 +652,7 @@ <descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr> <website>http://lightsquid.sf.net/</website> <category>Network Report</category> - <version>1.8.2 pkg v.2.35</version> + <version>2.39</version> <maintainer>dv_serg@mail.ru</maintainer> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>lightsquid-1.8_2.tbz</depends_on_package> @@ -1028,7 +1028,7 @@ On pfSense docs there is a how-to which could help you on porting users.]]></descr> <pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink> <category>System</category> - <version>2.2.5_3 pkg v1.6.11</version> + <version>1.6.12</version> <status>RC1</status> <required_version>2.1</required_version> <maintainer>nachtfalkeaw@web.de</maintainer> |
