[SCRIPTS] Make them work in v2 by setting PUBLICDIR

diff --git a/scripts/allsites.php b/scripts/allsites.php
index 211728c497fa9381bf53671738d1f2b8172768c7..c23685c721d1372bd6fe8b138c52bb4565477a7d 100755 (executable)
--- a/scripts/allsites.php
+++ b/scripts/allsites.php
@@ -20,7 +20,8 @@
 
 // Abort if called from a web server
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 't:w:';
 $longoptions = array('tagged=', 'not-tagged=');

diff --git a/scripts/backupuser.php b/scripts/backupuser.php
index 740ae25d446bbd0210f9af4aa6945b57a9d41fa1..2a9ace492650fa22eb9b0c6ee45c39daf7a347b9 100644 (file)
--- a/scripts/backupuser.php
+++ b/scripts/backupuser.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:f:a:j';
 $longoptions = array('id=', 'nickname=', 'file=', 'after=', 'json');

diff --git a/scripts/checkschema.php b/scripts/checkschema.php
index 584f7a39e753a4d4d18dbb497466758d435ceb37..bb9ca31aa2d92cc70afaa7d1f780c9011cf05f18 100755 (executable)
--- a/scripts/checkschema.php
+++ b/scripts/checkschema.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'x::';
 $longoptions = array('extensions=');

diff --git a/scripts/clean_file_table.php b/scripts/clean_file_table.php
index 573abf1ed0c8d246f92b04408acdba90256e2523..2444a4bb693564377eb345087c7c2de1d9111dbb 100755 (executable)
--- a/scripts/clean_file_table.php
+++ b/scripts/clean_file_table.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'y';
 $longoptions = array('yes');

diff --git a/scripts/clean_profiles.php b/scripts/clean_profiles.php
index 470d6c1b91b2c422397139f950889711bf9949fb..245b2ef5c779a833e454e8000ea7b2e8bc495872 100755 (executable)
--- a/scripts/clean_profiles.php
+++ b/scripts/clean_profiles.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'y';
 $longoptions = array('yes');

diff --git a/scripts/clean_thumbnails.php b/scripts/clean_thumbnails.php
index aef3f54aff50e1e305e402bee73a6ed1d9522bfd..dd3e9a08750faa3a343cb20405a794f75ae2a291 100755 (executable)
--- a/scripts/clean_thumbnails.php
+++ b/scripts/clean_thumbnails.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'y';
 $longoptions = array('yes');

diff --git a/scripts/clear_jabber.php b/scripts/clear_jabber.php
index 4ba24c275a37031ac0efe583cdde5affb0d376b0..eababeda21cb1f90f092842c310e1b21caa2ae64 100755 (executable)
--- a/scripts/clear_jabber.php
+++ b/scripts/clear_jabber.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i::n::y';
 $longoptions = array('id=', 'nickname=', 'yes', 'all', 'dry-run');

diff --git a/scripts/clearcache.php b/scripts/clearcache.php
index c67d6275d89194cbcaf1641443e695a9ce14cd03..bf590ef69c864e519dff77d469a1c8ad4edebcac 100755 (executable)
--- a/scripts/clearcache.php
+++ b/scripts/clearcache.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = "t:l:v:k:";
 

diff --git a/scripts/command.php b/scripts/command.php
index 1dbf7f6a7f3606aef89a810b600920b3f5d09bdd..182518d0aa54ff8d6ab49f4eefe285992db9eca3 100755 (executable)
--- a/scripts/command.php
+++ b/scripts/command.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(__DIR__ . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:o';
 $longoptions = array('id=', 'nickname=', 'owner');

diff --git a/scripts/console.php b/scripts/console.php
index 25d12e52e1da31ec51dd1b7cdfe950b481de2264..3424c7b24488868f8387690b0e59ec9ff1491271 100644 (file)
--- a/scripts/console.php
+++ b/scripts/console.php
@@ -24,7 +24,8 @@
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-define('INSTALLDIR', dirname(__FILE__));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 define('GNUSOCIAL', true);
 define('STATUSNET', true);
 

diff --git a/scripts/createsim.php b/scripts/createsim.php
index 624043161da9f19fe0e3512e760e0f770e3f2ca4..0e6d807442bf941f9cc665e4ef1ba45b9066642f 100755 (executable)
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'b:g:j:n:t:u:w:x:z:';
 $longoptions = array(

diff --git a/scripts/delete_notice.php b/scripts/delete_notice.php
index cd29cffc15eea2b5d7af051141c91b0fc0c105d9..f2350f87335ed678390e2641f46ac7d253d90227 100755 (executable)
--- a/scripts/delete_notice.php
+++ b/scripts/delete_notice.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i::u::y';
 $longoptions = array('id=', 'uri=', 'yes');

diff --git a/scripts/delete_orphan_files.php b/scripts/delete_orphan_files.php
index 2c49c10a508d468f5e859df0a437bf789d5b63d7..8c1212ef51fcb9a7b2690e3e19db674d6bd3c7fa 100755 (executable)
--- a/scripts/delete_orphan_files.php
+++ b/scripts/delete_orphan_files.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'y';
 $longoptions = array('yes');

diff --git a/scripts/deletegroup.php b/scripts/deletegroup.php
index f76a3dedc780e2207a3446c226fd535027450adb..33a5789a162201bcd111c8bdf1637aaecf641a3b 100755 (executable)
--- a/scripts/deletegroup.php
+++ b/scripts/deletegroup.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i::n::y';
 $longoptions = array('id=', 'nickname=', 'yes');

diff --git a/scripts/deleteprofile.php b/scripts/deleteprofile.php
index 8eed6ff97b718ce7ad77f6d00a2e60a4fdba785c..eb427f426d97fbfd9c457130bc19c7c8b33f567a 100755 (executable)
--- a/scripts/deleteprofile.php
+++ b/scripts/deleteprofile.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i::n::u::y';
 $longoptions = array('id=', 'nickname=', 'uri=', 'yes');

diff --git a/scripts/docgen.php b/scripts/docgen.php
index 607ee0328d7061a169d52aa985d402d83f1567f1..e8731a7d5afaf78d7c36a2ed942aa8fa8a489841 100755 (executable)
--- a/scripts/docgen.php
+++ b/scripts/docgen.php
@@ -17,6 +17,7 @@ Options:
 ENDOFHELP;
 
 define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 set_include_path(INSTALLDIR . DIRECTORY_SEPARATOR . 'extlib' . PATH_SEPARATOR . get_include_path());
 
 $pattern = "*.php *.inc";

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 9c5e3cf8b38c2fd9808803ba9c2c8437fcddfb89..ba159afdb9caf0e725a1a9659f5b94fb4224a2fd 100755 (executable)
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_CHECKSCHEMA_HELP
 Attempt to pull a schema definition for a given table.
@@ -250,4 +251,4 @@ if (count($args)) {
     }
 } else {
     show_help($helptext);
-}
\ No newline at end of file
+}

diff --git a/scripts/fixup_deletions.php b/scripts/fixup_deletions.php
index 07ada7f9d95c49089192243f430bcd7f6c39ebb4..330ccc376508c83ff315612bc2773888743203b0 100755 (executable)
--- a/scripts/fixup_deletions.php
+++ b/scripts/fixup_deletions.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $longoptions = array('dry-run', 'start=', 'end=');
 

diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php
index b5cdb764982a223f89b8db5ccd9e4f48b53f338e..343c9ee1440a2f598478d3caa10e82c793045b69 100755 (executable)
--- a/scripts/fixup_hashtags.php
+++ b/scripts/fixup_hashtags.php
@@ -24,7 +24,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     exit();
 }
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
 

diff --git a/scripts/flushrouter.php b/scripts/flushrouter.php
index 51178a725c6d5acfb369cfcbebcb81387c897b75..8bfb6febdcbf6e9a9ba13fb751ad992b151973dc 100755 (executable)
--- a/scripts/flushrouter.php
+++ b/scripts/flushrouter.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_FLUSHROUTER_HELP
 flushrouter.php -s<sitename>
@@ -31,4 +32,4 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 $cache = Cache::instance();
 $cache->delete(Router::cacheKey());
 
-print "OK.\n";
\ No newline at end of file
+print "OK.\n";

diff --git a/scripts/flushsite.php b/scripts/flushsite.php
index b7f385ac45f8652990f2849904845726814c470e..207b0e90354316a2d543d8a16d3ca7dfa272da34 100755 (executable)
--- a/scripts/flushsite.php
+++ b/scripts/flushsite.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'd';
 $longoptions = array('delete');
@@ -42,4 +43,4 @@ if (empty($sn)) {
 
 print "Flushing cache for {$nickname}...";
 $sn->decache();
-print "OK.\n";
\ No newline at end of file
+print "OK.\n";

diff --git a/scripts/getpiddir.php b/scripts/getpiddir.php
index 8274c37c0f89c01e4ce485bc8f04dec7e9bdbbcc..4c8e8b221c0936007c61d31ca24086f30a1c242b 100755 (executable)
--- a/scripts/getpiddir.php
+++ b/scripts/getpiddir.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<ENDOFHELP
 getpiddir.php - print out the currently configured PID directory

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 448fbb6d32cceb9282804fa6a162a66893a23aa2..61fe9b638ac2ebaff66eb290a28d4d11a91831a8 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -25,7 +25,8 @@
  * daemon names.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<ENDOFHELP
 getvaliddaemons.php - print out a list of valid daemons that should be started

diff --git a/scripts/gnusocialversion.php b/scripts/gnusocialversion.php
index dbe9c54c5ba9d838787dc2affbc3afe0265585f2..8189bfb98634dc1eed39f3dc7485fa4ed1ed1d67 100755 (executable)
--- a/scripts/gnusocialversion.php
+++ b/scripts/gnusocialversion.php
@@ -20,7 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_HELP
 gnusocialversion.php [options]

diff --git a/scripts/handlequeued.php b/scripts/handlequeued.php
index 0d77030c3f40b8542b330727538cc411532051da..9f318951cb4d7f5025bbfb2985a863f7399d600e 100755 (executable)
--- a/scripts/handlequeued.php
+++ b/scripts/handlequeued.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_QUEUE_HELP
 USAGE: handlequeued.php <queue> <notice id>

diff --git a/scripts/imdaemon.php b/scripts/imdaemon.php
index 0298c00522b52b9d3d2d0dd3c4324a1fb7ae13bf..96b4e0dfeb2911b9cdace739c9e596762e2658cd 100755 (executable)
--- a/scripts/imdaemon.php
+++ b/scripts/imdaemon.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'fi::a';
 $longoptions = array('id::', 'foreground', 'all');

diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php
index 2a4cb7fc41f2f0950ac69e5587b30c4e51c048b5..0cfcba04244fc350a4d450e61fc6b3762245bed4 100755 (executable)
--- a/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:f:';
 $longoptions = array('id=', 'nickname=', 'file=');

diff --git a/scripts/install_cli.php b/scripts/install_cli.php
index cb1ef4c0e1811e985d017564f3a29108c2948ac8..e4f8f600b1681a6136c469d55e4ae376c8103440 100755 (executable)
--- a/scripts/install_cli.php
+++ b/scripts/install_cli.php
@@ -31,6 +31,7 @@ if (php_sapi_name() !== 'cli') {
 }
 
 define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib');
 
 require_once INSTALLDIR . '/lib/installer.php';

diff --git a/scripts/joingroup.php b/scripts/joingroup.php
index bd73cbe79460b2c6788147237a7945367f4ebc98..782362cbf1e6f18bd01869bec34b9d9da2dc1c64 100644 (file)
--- a/scripts/joingroup.php
+++ b/scripts/joingroup.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:g:G:';
 $longoptions = array('id=', 'nickname=', 'group=', 'group-id=');

diff --git a/scripts/leavegroup.php b/scripts/leavegroup.php
index 8f9ef33e7edb2d33b2615d0023506e8479f489f5..4bece427f4f971a0824a75aaa51d51e37a191302 100644 (file)
--- a/scripts/leavegroup.php
+++ b/scripts/leavegroup.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:g:G:';
 $longoptions = array('id=', 'nickname=', 'group=', 'group-id=');

diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 3b1ef96a1e898617e86d56870f5c328106239bcc..809e97038db9cc3de66ee72a2f1d7dd8d5b532d4 100755 (executable)
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_HELP
 Script for converting mail messages into notices. Takes message body

diff --git a/scripts/make-release.php b/scripts/make-release.php
index 157cae067db619a491c0ed9d8a07a8f8ae97f1a5..138584888e3086abad6dc18babfdcbe305f951ed 100755 (executable)
--- a/scripts/make-release.php
+++ b/scripts/make-release.php
@@ -20,7 +20,8 @@
 
 // Abort if called from a web server
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 

diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php
index 345d93c665745896d99c81e5d1623b56a2c3700f..58277c9ea226bf46df8c8633be878e113a0ac285 100755 (executable)
--- a/scripts/makegroupadmin.php
+++ b/scripts/makegroupadmin.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'g:n:';
 $longoptions = array('nickname=', 'group=');

diff --git a/scripts/moveuser.php b/scripts/moveuser.php
index 17b3e0fb678e5e06c207f95476d0929e3d169bd6..de7554193279bf962b0b5205805be8fb10ad2543 100644 (file)
--- a/scripts/moveuser.php
+++ b/scripts/moveuser.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:r:w:y';
 $longoptions = array('id=', 'nickname=', 'remote=', 'password=');

diff --git a/scripts/nukefile.php b/scripts/nukefile.php
index 4001833e8cf8a23d5ac15a2e6217a531b4eced2e..e3073de104ec0bc61b44c7dab94d6c62e6ea2814 100755 (executable)
--- a/scripts/nukefile.php
+++ b/scripts/nukefile.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i::yv';
 $longoptions = array('id=', 'yes', 'verbose');

diff --git a/scripts/queuectl.php b/scripts/queuectl.php
index 1c9ea3353697b6f7d6e883efe100cceee94545d6..124ba60ae55d6aac515e512b62ee32c565d5b477 100755 (executable)
--- a/scripts/queuectl.php
+++ b/scripts/queuectl.php
@@ -25,7 +25,8 @@
  * @package QueueHandler
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'ur';
 $longoptions = array('update', 'restart', 'stop');

diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index e5dc1af8106a576953772847e5c217c10b948673..6d7cfcf22260d3bcf38519cf2670c9f405d6082a 100755 (executable)
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'fi:at:';
 $longoptions = array('id=', 'foreground', 'all', 'threads=');

diff --git a/scripts/registeruser.php b/scripts/registeruser.php
index 97caf645cd6eb812904d9c68da110e958e30ca49..b90f3615e034fcc45c9d1ab38806098d22ba67de 100755 (executable)
--- a/scripts/registeruser.php
+++ b/scripts/registeruser.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'n:w:f:e:';
 $longoptions = array('nickname=', 'password=', 'fullname=', 'email=');

diff --git a/scripts/remove_duplicate_file_urls.php b/scripts/remove_duplicate_file_urls.php
index a4a7cd795b9afa9b487eeaa77c022666ee9d6341..9754820d988998a9f924e760af3f669f5658a132 100755 (executable)
--- a/scripts/remove_duplicate_file_urls.php
+++ b/scripts/remove_duplicate_file_urls.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'y';
 $longoptions = array('yes');

diff --git a/scripts/resend_confirm_address.php b/scripts/resend_confirm_address.php
index b73246d6ef2450dacfab6bc1797269de3aaaf9e6..8a456a812cd1508cef4fe031c2c7f6bc2768bda0 100755 (executable)
--- a/scripts/resend_confirm_address.php
+++ b/scripts/resend_confirm_address.php
@@ -1,7 +1,8 @@
 #!/usr/bin/env php
 <?php
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'e::ay';
 $longoptions = array('email=', 'all', 'yes');

diff --git a/scripts/restoreuser.php b/scripts/restoreuser.php
index 6c287ad66784d8dc80c782ac4d782ada6fb03a1a..f5ff99b12767cf796e6e28936a4af7c20bfd226d 100644 (file)
--- a/scripts/restoreuser.php
+++ b/scripts/restoreuser.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:f:';
 $longoptions = array('id=', 'nickname=', 'file=');

diff --git a/scripts/sendemail.php b/scripts/sendemail.php
index d41f96564a23b8f646219909efff1619adb39fe2..e18ad36c7798a14a2f7dc5b1410ca5d083c03b22 100755 (executable)
--- a/scripts/sendemail.php
+++ b/scripts/sendemail.php
@@ -23,7 +23,8 @@
  * @link      https://www.gnu.org/software/social/
  */
 
-define('INSTALLDIR', realpath(dirname(__DIR__)));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:a:';
 $longoptions = ['id=', 'nickname=', 'subject=', 'all='];

diff --git a/scripts/sessiongc.php b/scripts/sessiongc.php
index a2ca2038899dd8130b9fd9771f368d651b0c036f..2a6afa0996ecb95ba6c642e670182cb5d3940295 100755 (executable)
--- a/scripts/sessiongc.php
+++ b/scripts/sessiongc.php
@@ -16,6 +16,7 @@
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 
 define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_GC_HELP
 sessiongc.php

diff --git a/scripts/setconfig.php b/scripts/setconfig.php
index 009c50dbf291061c4513c918341067780510fcd3..a5ada00b15728ae02ea85d334afe6db58f25cb65 100755 (executable)
--- a/scripts/setconfig.php
+++ b/scripts/setconfig.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'da';
 $longoptions = array('delete', 'all');

diff --git a/scripts/setpassword.php b/scripts/setpassword.php
index 66964b2a088d58f252599646832ff17aaeec2bc8..1c6597c8c29b8a5494c20f2887416a454f73848f 100755 (executable)
--- a/scripts/setpassword.php
+++ b/scripts/setpassword.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_PASSWORD_HELP
 setpassword.php <username> <password>

diff --git a/scripts/settag.php b/scripts/settag.php
index 19abce43c8018a5d1de97ca83e5740f730c2c294..fac44146d6d3d0903f9589e24c35989c2eddd505 100755 (executable)
--- a/scripts/settag.php
+++ b/scripts/settag.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'd';
 $longoptions = array('delete');

diff --git a/scripts/showcache.php b/scripts/showcache.php
index 8ef08467d6be139dd2a50ee11670962cbeb30cf7..991105454eab6fd2c477f5491cbad195f750f757 100755 (executable)
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = "t:l:v:k:";
 

diff --git a/scripts/showplugins.php b/scripts/showplugins.php
index e79b4e72242888f4661eedba444473e27caf6101..4ec2f00274c6e57d478976959fae954b89baab44 100755 (executable)
--- a/scripts/showplugins.php
+++ b/scripts/showplugins.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 

diff --git a/scripts/showtable.php b/scripts/showtable.php
index eb18a98e20d510cb3dfd2d8feee39abbd341dfd7..9746367b2922e926a11d0923a525d064e6e61ea9 100755 (executable)
--- a/scripts/showtable.php
+++ b/scripts/showtable.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<END_OF_SHOWTABLE_HELP
 showtable.php <tablename>

diff --git a/scripts/simple_console.php b/scripts/simple_console.php
index 7df05fd6e961b3ce9fa1251cc2475c9ca609cb6a..721fbab54689c4cf4c8c90bc1a46224bc35b8092 100644 (file)
--- a/scripts/simple_console.php
+++ b/scripts/simple_console.php
@@ -20,7 +20,8 @@
 
 // Abort if called from a web server
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<ENDOFHELP
 console.php - provide an interactive PHP interpreter for testing

diff --git a/scripts/strip_geo.php b/scripts/strip_geo.php
index 021b66885190dacbf944759738895272855256cc..7ab87e71bb8414e201ed8375996baa4c71a5dddf 100755 (executable)
--- a/scripts/strip_geo.php
+++ b/scripts/strip_geo.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i::n::y';
 $longoptions = array('id=', 'nickname=', 'yes', 'dry-run', 'all');

diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php
index b5955fd5aa9335a0ae259cdfb7baa24c3ea228bc..afb971b1289afd91f0c76743fcea39041a7c8f59 100755 (executable)
--- a/scripts/uncache_users.php
+++ b/scripts/uncache_users.php
@@ -17,7 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $helptext = <<<ENDOFHELP
 uncache_users.php <idfile>

diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php
index a5730e6d2f7f43955e08db8173ec5049c671ae36..c77d7e8a91b0e84de74ed2e2bbc5b53738f78f1a 100755 (executable)
--- a/scripts/update_po_templates.php
+++ b/scripts/update_po_templates.php
@@ -24,7 +24,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     exit();
 }
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 function update_core($dir, $domain)
 {

diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index e204e747c8354d63c880afb29f76ccb9f270bf3b..72ea81bdb6c89cd921f2096de73bcb11bda50f77 100755 (executable)
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -24,7 +24,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     exit();
 }
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
 

diff --git a/scripts/updatelocation.php b/scripts/updatelocation.php
index abf9627cc71e6daffc61c3b26802b7a435bece14..6a786932513831ff7327bb2685a3e58a4b3c3b2d 100755 (executable)
--- a/scripts/updatelocation.php
+++ b/scripts/updatelocation.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:af';
 $longoptions = array('id=', 'nickname=', 'all', 'force');

diff --git a/scripts/updateurls.php b/scripts/updateurls.php
index 8657d80b8480221056b27e20863a4ee8b15ab624..f4b57f07234a841d32128f4c04bf3358fb198f06 100755 (executable)
--- a/scripts/updateurls.php
+++ b/scripts/updateurls.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = '';
 $longoptions = array();

diff --git a/scripts/upgrade.php b/scripts/upgrade.php
index 6d419e14169e8a3edc08fba94713c9a0787b2a60..92e1c87c9d1ba291f31ce6dbcf5109078444c3ff 100755 (executable)
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
@@ -28,6 +28,7 @@
  */
 
 define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'dfx::';
 $longoptions = ['debug', 'files', 'extensions='];

diff --git a/scripts/useremail.php b/scripts/useremail.php
index 02c34678fb31eb1077a974a997f97c39c6e7ed56..d6899532451fdd997398f59e6a94e27c2a6c63bc 100755 (executable)
--- a/scripts/useremail.php
+++ b/scripts/useremail.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:e:';
 $longoptions = array('id=', 'nickname=', 'email=');

diff --git a/scripts/userrole.php b/scripts/userrole.php
index 92f6b685bdc045b9dc12f0003e5fb711eb008175..428abb8acedce4e93ad064a455aa58b3fa25bcf1 100755 (executable)
--- a/scripts/userrole.php
+++ b/scripts/userrole.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:r:d';
 $longoptions = array('id=', 'nickname=', 'role=', 'delete');