Use __DIR__ for relative include and require

For uniformity, and to avoid having PHP searching in include_path.
http://php.net/manual/function.include.php
https://github.com/FreshRSS/FreshRSS/pull/1715
https://github.com/FreshRSS/FreshRSS/pull/1711#issuecomment-350581350

cli/_cli.php

@@ -3,7 +3,7 @@ if (php_sapi_name() !== 'cli') {
 	die('FreshRSS error: This PHP script may only be invoked from command line!');
 }
 
-require(dirname(__FILE__) . '/../constants.php');
+require(__DIR__ . '/../constants.php');
 require(LIB_PATH . '/lib_rss.php');
 require(LIB_PATH . '/lib_install.php');
 

cli/_update-or-create-user.php

@@ -1,5 +1,5 @@
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $params = array(
 		'user:',

cli/actualize-user.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',

cli/create-user.php

@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 $isUpdate = false;
-require('_update-or-create-user.php');
+require(__DIR__ . '/_update-or-create-user.php');
 
 $username = $options['user'];
 if (!FreshRSS_user_Controller::checkUsername($username)) {

cli/db-optimize.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',

cli/delete-user.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',

cli/do-install.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 if (!file_exists(DATA_PATH . '/do-install.txt')) {
 	fail('FreshRSS looks to be already installed! Please use `./cli/reconfigure.php` instead.');

cli/export-opml-for-user.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',

cli/export-zip-for-user.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',

cli/import-for-user.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',

cli/list-users.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $users = listUsers();
 sort($users);

cli/reconfigure.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $params = array(
 		'environment:',

cli/update-user.php

@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 $isUpdate = true;
-require('_update-or-create-user.php');
+require(__DIR__ . '/_update-or-create-user.php');
 
 $username = cliInitUser($options['user']);
 

cli/user-info.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('h', array(
 		'user:',

lib/lib_rss.php

@@ -4,7 +4,7 @@ if (version_compare(PHP_VERSION, '5.3.8', '<')) {
 }
 
 if (!function_exists('json_decode')) {
-	require_once('JSON.php');
+	require_once(__DIR__ . '/JSON.php');
 	function json_decode($var, $assoc = false) {
 		$JSON = new Services_JSON($assoc ? SERVICES_JSON_LOOSE_TYPE : 0);
 		return $JSON->decode($var);
@@ -12,7 +12,7 @@ if (!function_exists('json_decode')) {
 }
 
 if (!function_exists('json_encode')) {
-	require_once('JSON.php');
+	require_once(__DIR__ . '/JSON.php');
 	function json_encode($var) {
 		$JSON = new Services_JSON();
 		return $JSON->encodeUnsafe($var);

p/api/greader.php

@@ -20,7 +20,7 @@ Server-side API compatible with Google Reader API layer 2
 * https://github.com/theoldreader/api
 */
 
-require('../../constants.php');
+require(__DIR__ . '/../../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 
 $ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, 1048576);

p/api/index.php

@@ -14,7 +14,7 @@
 <dl>
 <dt>Your API address:</dt>
 <dd><?php
-require('../../constants.php');
+require(__DIR__ . '/../../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php');
 echo Minz_Url::display('/api/greader.php', 'html', true);

p/api/pshb.php

@@ -1,5 +1,5 @@
 <?php
-require('../../constants.php');
+require(__DIR__ . '/../../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 
 const MAX_PAYLOAD = 3145728;

p/ext.php

@@ -5,7 +5,7 @@ if (!isset($_GET['f']) ||
 	die();
 }
 
-require('../constants.php');
+require(__DIR__ . '/../constants.php');
 
 /**
  * Check if a file can be served by ext.php. A valid file is under a

p/f.php

@@ -1,5 +1,5 @@
 <?php
-require('../constants.php');
+require(__DIR__ . '/../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 require(LIB_PATH . '/favicons.php');
 require(LIB_PATH . '/http-conditional.php');

p/i/index.php

@@ -18,7 +18,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-require('../../constants.php');
+require(__DIR__ . '/../../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 
 if (file_exists(DATA_PATH . '/do-install.txt')) {

tests/bootstrap.php

@@ -3,5 +3,5 @@
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
-require('../constants.php');
+require(__DIR__ . '/../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader