Fixup template installation broken on my last changes. Bump version to 2.40

2 files changed, 51 insertions, 41 deletions

diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc
index 503e9cf3..60ec1fc9 100644
--- a/config/lightsquid/lightsquid.inc
+++ b/config/lightsquid/lightsquid.inc
@@ -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',		'/usr/local/www/lightsquid/tpl');
+define('LS_TEMPLATEPATH',		LS_WWWPATH . '/tpl');
 define('LS_LANGPATH',			LIGHTSQUID_BASE . '/share/lightsquid/lang');
 define('LS_REPORTPATH',			'/var/lightsquid/report');
 
@@ -145,11 +145,21 @@ function lightsquid_install() {
 		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)) {
+
+		if (is_dir('/usr/local/www/lightsquid'))
+			$_gc = exec('rm -rf /usr/local/www/lightsquid');
+
+		if (is_dir(LS_WWWPATH)) {
 			symlink(LS_WWWPATH, '/usr/local/www/lightsquid');
 		}
 	}
 
+	foreach (array('novopf', 'novosea') as $tpl) {
+		if (file_exists(LS_TEMPLATEPATH . '/' . $tpl))
+			$_gc = exec('rm -rf ' . LS_TEMPLATEPATH . '/' . $tpl);
+		symlink('/usr/local/share/lightsquid/tpl/' . $tpl, LS_TEMPLATEPATH . '/' . $tpl);
+	}
+
 	update_log("lightsquid_install: stopped");
 }
 
diff --git a/config/lightsquid/lightsquid.xml b/config/lightsquid/lightsquid.xml
index 19ba4512..4f60997c 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>2.39</version>
+	<version>2.40</version>
 	<title>Services: Proxy Reports (LightSquid, SQStat) -> Settings</title>
 	<category>Status</category>
 	<include_file>/usr/local/pkg/lightsquid.inc</include_file>
@@ -97,192 +97,192 @@
                <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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/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>
+		<prefix>/usr/local/share/lightsquid/tpl/novosea/</prefix>
 		<chmod>0444</chmod>
 		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/whousesite.html</item>
 	</additional_files_needed>