Merge branch 'master' into tiny-oop

debian/tt-rss-common.install

@@ -1,6 +1,7 @@
 *.php usr/share/tt-rss/www/
 *.css usr/share/tt-rss/www/
-*.js usr/share/tt-rss/www/
+js usr/share/tt-rss/www/
+include usr/share/tt-rss/www/
 *.xsl usr/share/tt-rss/www/
 api	usr/share/tt-rss/www
 help  usr/share/tt-rss/www/

debian/tt-rss-mysql.postinst

@@ -40,7 +40,7 @@ case "$1" in
 	dbc_generate_include_perms="0640"
 	dbc_go $PACKAGE $@
 
-	echo "Install ok on http://localhost/tt-rss/tt-rss.php"
+	echo "Install ok on http://localhost/tt-rss/"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/tt-rss-pgsql.postinst

@@ -40,7 +40,7 @@ case "$1" in
 	dbc_generate_include_perms="0640"
 	dbc_go $PACKAGE $@
 
-	echo "Install ok on http://localhost/tt-rss/tt-rss.php"
+	echo "Install ok on http://localhost/tt-rss/"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

include/sanity_check.php

@@ -1,15 +1,15 @@
 <?php
 	require_once "functions.php";
 
-	define('EXPECTED_CONFIG_VERSION', 23);
-	define('SCHEMA_VERSION', 86);
-
 	if (!file_exists("config.php")) {
 		print "<b>Fatal Error</b>: You forgot to copy
 		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
 		exit;
 	}
 
+	define('EXPECTED_CONFIG_VERSION', 23);
+	define('SCHEMA_VERSION', 86);
+
 	require_once "config.php";
 	require_once "sanity_config.php";
 

index.php

@@ -1,4 +1,10 @@
 <?php
+	if (!file_exists("config.php")) {
+		print "<b>Fatal Error</b>: You forgot to copy
+		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
+		exit;
+	}
+
 	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
 
 	require_once "functions.php";

utils/regen_config_checks.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DESTINATION="sanity_config.php"
+DESTINATION="include/sanity_config.php"
 
 echo "<?php # This file has been generated at: " `date` > $DESTINATION