From 52d09886558361bd818182da9ddc204e83f618ba Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 11 Dec 2017 21:11:34 +0100
Subject: 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                   | 2 +-
 cli/_update-or-create-user.php | 2 +-
 cli/actualize-user.php         | 2 +-
 cli/create-user.php            | 2 +-
 cli/db-optimize.php            | 2 +-
 cli/delete-user.php            | 2 +-
 cli/do-install.php             | 2 +-
 cli/export-opml-for-user.php   | 2 +-
 cli/export-zip-for-user.php    | 2 +-
 cli/import-for-user.php        | 2 +-
 cli/list-users.php             | 2 +-
 cli/reconfigure.php            | 2 +-
 cli/update-user.php            | 2 +-
 cli/user-info.php              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'cli')

diff --git a/cli/_cli.php b/cli/_cli.php
index fb35c4afb..72629171c 100644
--- a/cli/_cli.php
+++ b/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');
 
diff --git a/cli/_update-or-create-user.php b/cli/_update-or-create-user.php
index 15397f1f6..a5960b58a 100644
--- a/cli/_update-or-create-user.php
+++ b/cli/_update-or-create-user.php
@@ -1,5 +1,5 @@
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $params = array(
 		'user:',
diff --git a/cli/actualize-user.php b/cli/actualize-user.php
index 932c6975c..dd07fc142 100755
--- a/cli/actualize-user.php
+++ b/cli/actualize-user.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',
diff --git a/cli/create-user.php b/cli/create-user.php
index 1b6be3153..5bc6c1e6c 100755
--- a/cli/create-user.php
+++ b/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)) {
diff --git a/cli/db-optimize.php b/cli/db-optimize.php
index 83123a669..39dc97638 100755
--- a/cli/db-optimize.php
+++ b/cli/db-optimize.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',
diff --git a/cli/delete-user.php b/cli/delete-user.php
index baa81b893..30cc31754 100755
--- a/cli/delete-user.php
+++ b/cli/delete-user.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',
diff --git a/cli/do-install.php b/cli/do-install.php
index 37db85575..4ebba0469 100755
--- a/cli/do-install.php
+++ b/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.');
diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php
index 95b12281f..fd0993c35 100755
--- a/cli/export-opml-for-user.php
+++ b/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:',
diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php
index 92fe9bf9a..916ecbb45 100755
--- a/cli/export-zip-for-user.php
+++ b/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:',
diff --git a/cli/import-for-user.php b/cli/import-for-user.php
index 29084f062..95ff18c8c 100755
--- a/cli/import-for-user.php
+++ b/cli/import-for-user.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('', array(
 		'user:',
diff --git a/cli/list-users.php b/cli/list-users.php
index 00a0b2b2c..758bbdb46 100755
--- a/cli/list-users.php
+++ b/cli/list-users.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $users = listUsers();
 sort($users);
diff --git a/cli/reconfigure.php b/cli/reconfigure.php
index 466d35373..cfe713fa8 100755
--- a/cli/reconfigure.php
+++ b/cli/reconfigure.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $params = array(
 		'environment:',
diff --git a/cli/update-user.php b/cli/update-user.php
index ac674484c..4529b8531 100755
--- a/cli/update-user.php
+++ b/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']);
 
diff --git a/cli/user-info.php b/cli/user-info.php
index 41b95cbf3..18a415217 100755
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
+require(__DIR__ . '/_cli.php');
 
 $options = getopt('h', array(
 		'user:',
-- 
cgit v1.2.3