Merge branch 'dev' into hebrew-i18n

1 files changed, 14 insertions, 5 deletions

diff --git a/constants.php b/constants.php
index b20bf0710..576be09b9 100644
--- a/constants.php
+++ b/constants.php
@@ -1,23 +1,32 @@
 <?php
-define('FRESHRSS_VERSION', '1.2-dev');
-define('FRESHRSS_WEBSITE', 'http://freshrss.org');
-define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
-define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
+define('FRESHRSS_VERSION', '1.8.1-dev');
+define('FRESHRSS_WEBSITE', 'https://freshrss.org');
+define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/');
+
+define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
 define('PHP_COMPRESSION', false);
 
+// Maximum log file size in Bytes, before it will be divided by two
+define('MAX_LOG_SIZE', 1048576);
+
 // Constantes de chemins
 define('FRESHRSS_PATH', dirname(__FILE__));
 
 	define('PUBLIC_PATH', FRESHRSS_PATH . '/p');
-		define('INDEX_PATH', PUBLIC_PATH . '/i');
+		define('PUBLIC_TO_INDEX_PATH', '/i');
+		define('INDEX_PATH', PUBLIC_PATH . PUBLIC_TO_INDEX_PATH);
 		define('PUBLIC_RELATIVE', '..');
 
 	define('DATA_PATH', FRESHRSS_PATH . '/data');
 		define('UPDATE_FILENAME', DATA_PATH . '/update.php');
 		define('USERS_PATH', DATA_PATH . '/users');
+		define('ADMIN_LOG', USERS_PATH . '/_/log.txt');
+		define('API_LOG', USERS_PATH . '/_/log_api.txt');
 		define('CACHE_PATH', DATA_PATH . '/cache');
+		define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
+		define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
 
 	define('LIB_PATH', FRESHRSS_PATH . '/lib');
 	define('APP_PATH', FRESHRSS_PATH . '/app');