From c259d04137dd8385996f8c641a7cfdc21406e22b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 18 Aug 2014 13:13:22 +0200 Subject: [PATCH] Renamed commandline.inc -> commandline.inc.php to avoid confusion. Signed-off-by: Roland Haeder --- plugins/ActivitySpam/scripts/silencespammer.php | 2 +- plugins/ActivitySpam/scripts/testuser.php | 2 +- plugins/ActivitySpam/scripts/trainuser.php | 2 +- plugins/AnonymousFave/scripts/initialize_fave_tallys.php | 2 +- plugins/Bookmark/scripts/importbookmarks.php | 2 +- plugins/DomainStatusNetwork/scripts/installforemail.php | 2 +- plugins/DomainStatusNetwork/scripts/proposesite.php | 2 +- plugins/DomainStatusNetwork/scripts/sitefordomain.php | 2 +- plugins/EmailRegistration/scripts/cancelemailregistration.php | 2 +- plugins/EmailRegistration/scripts/registeremailuser.php | 2 +- plugins/EmailReminder/scripts/sendemailreminder.php | 2 +- plugins/EmailSummary/scripts/sendemailsummary.php | 2 +- plugins/OStatus/scripts/fixup-shadow.php | 2 +- plugins/OStatus/scripts/gcfeeds.php | 2 +- plugins/OStatus/scripts/renew-feeds.php | 2 +- plugins/OStatus/scripts/resub-feed.php | 2 +- plugins/OStatus/scripts/rm_bad_feedsubs.php | 2 +- plugins/OStatus/scripts/testfeed.php | 2 +- plugins/OStatus/scripts/update-profile-data.php | 2 +- plugins/OStatus/scripts/update-profile.php | 2 +- plugins/OStatus/scripts/update_ostatus_profiles.php | 2 +- plugins/OStatus/tests/gettext-speedtest.php | 2 +- plugins/OStatus/tests/slap.php | 2 +- plugins/Oembed/scripts/fixup_files.php | 2 +- plugins/Realtime/scripts/cleanupchannels.php | 2 +- plugins/RequireValidatedEmail/scripts/registerbyemail.php | 2 +- plugins/Sitemap/scripts/updatecounts.php | 2 +- plugins/SphinxSearch/scripts/gen_config.php | 2 +- plugins/SphinxSearch/scripts/index_update.php | 2 +- plugins/TwitterBridge/daemons/synctwitterfriends.php | 2 +- plugins/TwitterBridge/daemons/twitterdaemon.php | 2 +- plugins/TwitterBridge/daemons/twitterstatusfetcher.php | 2 +- plugins/TwitterBridge/scripts/fakestream.php | 2 +- plugins/TwitterBridge/scripts/initialize_notice_to_status.php | 2 +- plugins/TwitterBridge/scripts/streamtest.php | 2 +- scripts/allsites.php | 2 +- scripts/backupuser.php | 2 +- scripts/checkschema.php | 2 +- scripts/clean_thumbnails.php | 2 +- scripts/clear_jabber.php | 2 +- scripts/clearcache.php | 2 +- scripts/command.php | 2 +- scripts/{commandline.inc => commandline.inc.php} | 0 scripts/console.php | 2 +- scripts/createsim.php | 2 +- scripts/deletegroup.php | 2 +- scripts/deleteuser.php | 2 +- scripts/dumpschema.php | 4 ++-- scripts/fixup_deletions.php | 2 +- scripts/flushrouter.php | 4 ++-- scripts/flushsite.php | 4 ++-- scripts/getpiddir.php | 2 +- scripts/getvaliddaemons.php | 2 +- scripts/gnusocialversion.php | 2 +- scripts/handlequeued.php | 2 +- scripts/imdaemon.php | 2 +- scripts/importtwitteratom.php | 2 +- scripts/joingroup.php | 2 +- scripts/leavegroup.php | 2 +- scripts/maildaemon.php | 2 +- scripts/make-release.php | 2 +- scripts/makegroupadmin.php | 2 +- scripts/moveuser.php | 2 +- scripts/queuectl.php | 2 +- scripts/queuedaemon.php | 2 +- scripts/registeruser.php | 2 +- scripts/restoreuser.php | 2 +- scripts/sendemail.php | 2 +- scripts/sessiongc.php | 2 +- scripts/setconfig.php | 2 +- scripts/setpassword.php | 2 +- scripts/settag.php | 2 +- scripts/showcache.php | 2 +- scripts/showplugins.php | 2 +- scripts/showtable.php | 2 +- scripts/strip_geo.php | 2 +- scripts/uncache_users.php | 2 +- scripts/updatelocation.php | 2 +- scripts/updateurls.php | 2 +- scripts/upgrade.php | 2 +- scripts/useremail.php | 2 +- scripts/userrole.php | 2 +- tests/atompub/atompub_test.php | 2 +- tests/oauth/fetch_temp_creds.php | 2 +- tests/oauth/fetch_token_creds.php | 2 +- tests/oauth/oauth_post_notice.php | 2 +- tests/oauth/oauth_verify_creds.php | 2 +- 87 files changed, 89 insertions(+), 89 deletions(-) rename scripts/{commandline.inc => commandline.inc.php} (100%) diff --git a/plugins/ActivitySpam/scripts/silencespammer.php b/plugins/ActivitySpam/scripts/silencespammer.php index 3a5e585fd5..4e710d10a7 100644 --- a/plugins/ActivitySpam/scripts/silencespammer.php +++ b/plugins/ActivitySpam/scripts/silencespammer.php @@ -31,7 +31,7 @@ Users who post a lot of spam get silenced -a --all All users END_OF_SILENCESPAMMER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function testAllUsers($filter, $minimum, $percent) { $found = false; diff --git a/plugins/ActivitySpam/scripts/testuser.php b/plugins/ActivitySpam/scripts/testuser.php index 0eee9324bf..af3cc5b47a 100644 --- a/plugins/ActivitySpam/scripts/testuser.php +++ b/plugins/ActivitySpam/scripts/testuser.php @@ -31,7 +31,7 @@ Test user activities against the spam filter -a --all All users END_OF_TESTUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function testAllUsers($filter) { $found = false; diff --git a/plugins/ActivitySpam/scripts/trainuser.php b/plugins/ActivitySpam/scripts/trainuser.php index 974048b4c9..a0d60b9a7b 100644 --- a/plugins/ActivitySpam/scripts/trainuser.php +++ b/plugins/ActivitySpam/scripts/trainuser.php @@ -32,7 +32,7 @@ Train user activities against the spam filter END_OF_TRAINUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function trainUser($filter, $user, $category) { diff --git a/plugins/AnonymousFave/scripts/initialize_fave_tallys.php b/plugins/AnonymousFave/scripts/initialize_fave_tallys.php index a955620db5..e0d0213d8f 100755 --- a/plugins/AnonymousFave/scripts/initialize_fave_tallys.php +++ b/plugins/AnonymousFave/scripts/initialize_fave_tallys.php @@ -27,7 +27,7 @@ Offline script to initialize notice fave tallys ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $notice = new Notice(); $notice->find(); diff --git a/plugins/Bookmark/scripts/importbookmarks.php b/plugins/Bookmark/scripts/importbookmarks.php index c47a042973..af7dd2d1e0 100644 --- a/plugins/Bookmark/scripts/importbookmarks.php +++ b/plugins/Bookmark/scripts/importbookmarks.php @@ -42,7 +42,7 @@ Restore a backed-up Delicious.com bookmark file -f --file file to read from (STDIN by default) END_OF_IMPORTBOOKMARKS_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; /** * Get the bookmarks file as a string diff --git a/plugins/DomainStatusNetwork/scripts/installforemail.php b/plugins/DomainStatusNetwork/scripts/installforemail.php index f773094a74..1815b97759 100644 --- a/plugins/DomainStatusNetwork/scripts/installforemail.php +++ b/plugins/DomainStatusNetwork/scripts/installforemail.php @@ -35,7 +35,7 @@ Create a new account and, if necessary, a new network for the given email addres END_OF_INSTALLFOREMAIL_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $email = $args[0]; diff --git a/plugins/DomainStatusNetwork/scripts/proposesite.php b/plugins/DomainStatusNetwork/scripts/proposesite.php index 96a722fdab..28741a5d4f 100644 --- a/plugins/DomainStatusNetwork/scripts/proposesite.php +++ b/plugins/DomainStatusNetwork/scripts/proposesite.php @@ -28,7 +28,7 @@ Prints site information for the domain given END_OF_SITEFORDOMAIN_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $domain = DomainStatusNetworkPlugin::toDomain($args[0]); diff --git a/plugins/DomainStatusNetwork/scripts/sitefordomain.php b/plugins/DomainStatusNetwork/scripts/sitefordomain.php index 59412cceba..2eaa600d25 100644 --- a/plugins/DomainStatusNetwork/scripts/sitefordomain.php +++ b/plugins/DomainStatusNetwork/scripts/sitefordomain.php @@ -28,7 +28,7 @@ Prints site information for the domain given END_OF_SITEFORDOMAIN_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $domain = DomainStatusNetworkPlugin::toDomain($args[0]); diff --git a/plugins/EmailRegistration/scripts/cancelemailregistration.php b/plugins/EmailRegistration/scripts/cancelemailregistration.php index d834aade60..7ae81f7ccf 100644 --- a/plugins/EmailRegistration/scripts/cancelemailregistration.php +++ b/plugins/EmailRegistration/scripts/cancelemailregistration.php @@ -33,7 +33,7 @@ Cancel an email registration code END_OF_REGISTEREMAILUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (count($args) == 0) { show_help(); diff --git a/plugins/EmailRegistration/scripts/registeremailuser.php b/plugins/EmailRegistration/scripts/registeremailuser.php index 02915240d3..a785a76a66 100644 --- a/plugins/EmailRegistration/scripts/registeremailuser.php +++ b/plugins/EmailRegistration/scripts/registeremailuser.php @@ -34,7 +34,7 @@ register a new user by email address. END_OF_REGISTEREMAILUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (count($args) == 0) { show_help(); diff --git a/plugins/EmailReminder/scripts/sendemailreminder.php b/plugins/EmailReminder/scripts/sendemailreminder.php index 2cc214a671..707bb40907 100644 --- a/plugins/EmailReminder/scripts/sendemailreminder.php +++ b/plugins/EmailReminder/scripts/sendemailreminder.php @@ -35,7 +35,7 @@ Send an email summary of the inbox to users END_OF_SENDEMAILREMINDER_HELP; -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; $quiet = have_option('q', 'quiet'); diff --git a/plugins/EmailSummary/scripts/sendemailsummary.php b/plugins/EmailSummary/scripts/sendemailsummary.php index 01c11a210a..2743bd1852 100644 --- a/plugins/EmailSummary/scripts/sendemailsummary.php +++ b/plugins/EmailSummary/scripts/sendemailsummary.php @@ -33,7 +33,7 @@ Send an email summary of the inbox to users END_OF_SENDEMAILSUMMARY_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('u', 'universe')) { $sn = new Status_network(); diff --git a/plugins/OStatus/scripts/fixup-shadow.php b/plugins/OStatus/scripts/fixup-shadow.php index ffaae5588d..2f6a6ffa04 100644 --- a/plugins/OStatus/scripts/fixup-shadow.php +++ b/plugins/OStatus/scripts/fixup-shadow.php @@ -31,7 +31,7 @@ for local users and groups. END_OF_USERROLE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $dry = have_option('dry-run'); diff --git a/plugins/OStatus/scripts/gcfeeds.php b/plugins/OStatus/scripts/gcfeeds.php index a4f71ab77f..94ead535fb 100644 --- a/plugins/OStatus/scripts/gcfeeds.php +++ b/plugins/OStatus/scripts/gcfeeds.php @@ -26,7 +26,7 @@ Clean up feeds that no longer have subscribers. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $feedsub = new FeedSub(); $feedsub->find(); diff --git a/plugins/OStatus/scripts/renew-feeds.php b/plugins/OStatus/scripts/renew-feeds.php index 8f8ac3ee1d..01136de417 100644 --- a/plugins/OStatus/scripts/renew-feeds.php +++ b/plugins/OStatus/scripts/renew-feeds.php @@ -26,7 +26,7 @@ Resubscribe to any soon expiring feeds. Default time to expiration is 1 day. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; try { $sub = FeedSub::renewalCheck(); diff --git a/plugins/OStatus/scripts/resub-feed.php b/plugins/OStatus/scripts/resub-feed.php index 3d13724f7d..edf64cd5f6 100644 --- a/plugins/OStatus/scripts/resub-feed.php +++ b/plugins/OStatus/scripts/resub-feed.php @@ -34,7 +34,7 @@ Options: END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (empty($args[0]) || !Validate::uri($args[0])) { print "$helptext"; diff --git a/plugins/OStatus/scripts/rm_bad_feedsubs.php b/plugins/OStatus/scripts/rm_bad_feedsubs.php index ce1698a60c..1957f95cb3 100644 --- a/plugins/OStatus/scripts/rm_bad_feedsubs.php +++ b/plugins/OStatus/scripts/rm_bad_feedsubs.php @@ -41,7 +41,7 @@ the hub is probably either broken or doesn't exist.' END_OF_HELP; -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; $dry = false; diff --git a/plugins/OStatus/scripts/testfeed.php b/plugins/OStatus/scripts/testfeed.php index 42f21a7aa0..316b20b41d 100644 --- a/plugins/OStatus/scripts/testfeed.php +++ b/plugins/OStatus/scripts/testfeed.php @@ -33,7 +33,7 @@ Mainly intended for testing funky feed formats. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (empty($args[0]) || !Validate::uri($args[0])) { print "$helptext"; diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php index 116061a7c3..4e29148c86 100644 --- a/plugins/OStatus/scripts/update-profile-data.php +++ b/plugins/OStatus/scripts/update-profile-data.php @@ -36,7 +36,7 @@ Options: END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function showProfileInfo(Ostatus_profile $oprofile) { if ($oprofile->isGroup()) { diff --git a/plugins/OStatus/scripts/update-profile.php b/plugins/OStatus/scripts/update-profile.php index ece1980442..5b0c8b92e6 100644 --- a/plugins/OStatus/scripts/update-profile.php +++ b/plugins/OStatus/scripts/update-profile.php @@ -30,7 +30,7 @@ things restarted if the hub or feed URLs have changed for the profile. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (empty($args[0]) || !Validate::uri($args[0])) { print "$helptext"; diff --git a/plugins/OStatus/scripts/update_ostatus_profiles.php b/plugins/OStatus/scripts/update_ostatus_profiles.php index a5c8ad5437..b4191e9eb5 100644 --- a/plugins/OStatus/scripts/update_ostatus_profiles.php +++ b/plugins/OStatus/scripts/update_ostatus_profiles.php @@ -35,7 +35,7 @@ you have no backup. UPDATE_OSTATUS_PROFILES; -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; /* * Hacky class to remove some checks and get public access to diff --git a/plugins/OStatus/tests/gettext-speedtest.php b/plugins/OStatus/tests/gettext-speedtest.php index 0584af8ef4..52c8252c13 100644 --- a/plugins/OStatus/tests/gettext-speedtest.php +++ b/plugins/OStatus/tests/gettext-speedtest.php @@ -9,7 +9,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..')); define('GNUSOCIAL', true); define('STATUSNET', true); // compatibility -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; require_once INSTALLDIR . '/extlib/php-gettext/gettext.inc'; common_init_locale("en_US"); diff --git a/plugins/OStatus/tests/slap.php b/plugins/OStatus/tests/slap.php index e3f5439aed..eaef76d8cd 100644 --- a/plugins/OStatus/tests/slap.php +++ b/plugins/OStatus/tests/slap.php @@ -34,7 +34,7 @@ Test generation and sending of magic envelopes for Salmon slaps. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (!have_option('--notice')) { print "$helptext"; diff --git a/plugins/Oembed/scripts/fixup_files.php b/plugins/Oembed/scripts/fixup_files.php index 50ddc8a994..d2fb6b9ccb 100755 --- a/plugins/Oembed/scripts/fixup_files.php +++ b/plugins/Oembed/scripts/fixup_files.php @@ -30,7 +30,7 @@ Patches up file entries with corrupted types and titles (the "h bug"). END_OF_USERROLE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $dry = have_option('dry-run'); diff --git a/plugins/Realtime/scripts/cleanupchannels.php b/plugins/Realtime/scripts/cleanupchannels.php index ea195b02cd..220d85b7e4 100644 --- a/plugins/Realtime/scripts/cleanupchannels.php +++ b/plugins/Realtime/scripts/cleanupchannels.php @@ -33,7 +33,7 @@ Garbage-collects old realtime channels END_OF_CLEANUPCHANNELS_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function cleanupChannels() { diff --git a/plugins/RequireValidatedEmail/scripts/registerbyemail.php b/plugins/RequireValidatedEmail/scripts/registerbyemail.php index 4d2000ab0f..6935e00ee5 100644 --- a/plugins/RequireValidatedEmail/scripts/registerbyemail.php +++ b/plugins/RequireValidatedEmail/scripts/registerbyemail.php @@ -30,7 +30,7 @@ Registers a new user by email address and sends a confirmation email END_OF_REGISTERBYEMAIL_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $email = get_option_value('e', 'email'); diff --git a/plugins/Sitemap/scripts/updatecounts.php b/plugins/Sitemap/scripts/updatecounts.php index 91bc0ac4e9..744dab8287 100644 --- a/plugins/Sitemap/scripts/updatecounts.php +++ b/plugins/Sitemap/scripts/updatecounts.php @@ -26,7 +26,7 @@ Update the notice and user counts cached in the database. END_OF_UPDATECOUNTS_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; // Will fill the cache diff --git a/plugins/SphinxSearch/scripts/gen_config.php b/plugins/SphinxSearch/scripts/gen_config.php index e7f3977478..000a929243 100755 --- a/plugins/SphinxSearch/scripts/gen_config.php +++ b/plugins/SphinxSearch/scripts/gen_config.php @@ -32,7 +32,7 @@ Generates sphinx.conf file based on StatusNet configuration. END_OF_TRIM_HELP; -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; require dirname(__FILE__) . '/sphinx-utils.php'; diff --git a/plugins/SphinxSearch/scripts/index_update.php b/plugins/SphinxSearch/scripts/index_update.php index abac5434f7..79d9040e0e 100755 --- a/plugins/SphinxSearch/scripts/index_update.php +++ b/plugins/SphinxSearch/scripts/index_update.php @@ -34,7 +34,7 @@ Runs Sphinx search indexer. END_OF_TRIM_HELP; -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; require dirname(__FILE__) . '/sphinx-utils.php'; sphinx_iterate_sites('sphinx_index_update'); diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php index 651c4d34da..d56e5abb64 100755 --- a/plugins/TwitterBridge/daemons/synctwitterfriends.php +++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php @@ -30,7 +30,7 @@ Batch script for synching local friends with Twitter friends. END_OF_TRIM_HELP; -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; /** diff --git a/plugins/TwitterBridge/daemons/twitterdaemon.php b/plugins/TwitterBridge/daemons/twitterdaemon.php index 8b774889d1..e563f53493 100644 --- a/plugins/TwitterBridge/daemons/twitterdaemon.php +++ b/plugins/TwitterBridge/daemons/twitterdaemon.php @@ -33,7 +33,7 @@ Daemon script for receiving new notices from Twitter users. END_OF_TWITTERDAEMON_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; class TwitterDaemon extends SpawningDaemon { diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index b4b78dc80a..0f03a385a7 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -36,7 +36,7 @@ Batch script for retrieving Twitter messages from foreign service. END_OF_TRIM_HELP; -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; require_once INSTALLDIR . '/lib/common.php'; require_once INSTALLDIR . '/lib/daemon.php'; require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; diff --git a/plugins/TwitterBridge/scripts/fakestream.php b/plugins/TwitterBridge/scripts/fakestream.php index e827a07117..f112f4f190 100644 --- a/plugins/TwitterBridge/scripts/fakestream.php +++ b/plugins/TwitterBridge/scripts/fakestream.php @@ -42,7 +42,7 @@ data as it comes. ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('n')) { $nickname = get_option_value('n'); diff --git a/plugins/TwitterBridge/scripts/initialize_notice_to_status.php b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php index f4a60c479d..12fb245748 100644 --- a/plugins/TwitterBridge/scripts/initialize_notice_to_status.php +++ b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php @@ -29,7 +29,7 @@ version 0.9.5. ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; // We update any notices that may have come in from // Twitter that we don't have a status_id for. Note that diff --git a/plugins/TwitterBridge/scripts/streamtest.php b/plugins/TwitterBridge/scripts/streamtest.php index 4e8340bb3f..dc427a19fa 100644 --- a/plugins/TwitterBridge/scripts/streamtest.php +++ b/plugins/TwitterBridge/scripts/streamtest.php @@ -43,7 +43,7 @@ data as it comes. ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; require_once dirname(dirname(__FILE__)) . '/lib/jsonstreamreader.php'; require_once dirname(dirname(__FILE__)) . '/lib/twitterstreamreader.php'; diff --git a/scripts/allsites.php b/scripts/allsites.php index 211728c497..59c4be2b91 100755 --- a/scripts/allsites.php +++ b/scripts/allsites.php @@ -34,7 +34,7 @@ USAGE: allsites.php [OPTIONS] ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function print_all_sites() { diff --git a/scripts/backupuser.php b/scripts/backupuser.php index 740ae25d44..409c2737e2 100644 --- a/scripts/backupuser.php +++ b/scripts/backupuser.php @@ -33,7 +33,7 @@ Export a StatusNet user history to a file END_OF_EXPORTACTIVITYSTREAM_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; try { $user = getUser(); diff --git a/scripts/checkschema.php b/scripts/checkschema.php index cec5773683..6a4c8c972c 100755 --- a/scripts/checkschema.php +++ b/scripts/checkschema.php @@ -32,7 +32,7 @@ Gives plugins a chance to update the database schema. END_OF_CHECKSCHEMA_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function tableDefs() { diff --git a/scripts/clean_thumbnails.php b/scripts/clean_thumbnails.php index aef3f54aff..04bf1083ee 100755 --- a/scripts/clean_thumbnails.php +++ b/scripts/clean_thumbnails.php @@ -35,7 +35,7 @@ If the script seems to stop, it is processing correct File_thumbnail entries. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (!have_option('y', 'yes')) { print "About to delete locally generated thumbnails to allow regeneration. Are you sure? [y/N] "; diff --git a/scripts/clear_jabber.php b/scripts/clear_jabber.php index a71ccb2d67..50edebd78d 100755 --- a/scripts/clear_jabber.php +++ b/scripts/clear_jabber.php @@ -34,7 +34,7 @@ Deletes a user's confirmed Jabber/XMPP address from the database. END_OF_DELETEUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); diff --git a/scripts/clearcache.php b/scripts/clearcache.php index c67d6275d8..5904681edd 100644 --- a/scripts/clearcache.php +++ b/scripts/clearcache.php @@ -33,7 +33,7 @@ clears the cached object based on the args END_OF_CLEARCACHE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $karg = get_option_value('k', 'key'); diff --git a/scripts/command.php b/scripts/command.php index 256743f535..5ffa5bda0d 100755 --- a/scripts/command.php +++ b/scripts/command.php @@ -33,7 +33,7 @@ Perform commands on behalf of a user, such as sub, unsub, join, drop END_OF_USERROLE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function interpretCommand($user, $body) { diff --git a/scripts/commandline.inc b/scripts/commandline.inc.php similarity index 100% rename from scripts/commandline.inc rename to scripts/commandline.inc.php diff --git a/scripts/console.php b/scripts/console.php index c260ffaa00..44f3934a1f 100755 --- a/scripts/console.php +++ b/scripts/console.php @@ -27,7 +27,7 @@ console.php - provide an interactive PHP interpreter for testing ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; // Assume we're on a terminal if on Windows, otherwise posix_isatty tells us. define('CONSOLE_INTERACTIVE', !function_exists('posix_isatty') || posix_isatty(0)); diff --git a/scripts/createsim.php b/scripts/createsim.php index 6cbb8c28aa..03fb19aaca 100644 --- a/scripts/createsim.php +++ b/scripts/createsim.php @@ -49,7 +49,7 @@ Creates a lot of test users and notices to (loosely) simulate a real server. END_OF_CREATESIM_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; // XXX: make these command-line options diff --git a/scripts/deletegroup.php b/scripts/deletegroup.php index f76a3dedc7..fc00e70b08 100755 --- a/scripts/deletegroup.php +++ b/scripts/deletegroup.php @@ -33,7 +33,7 @@ deletes a group from the database END_OF_DELETEGROUP_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php index 25af1c5ce2..e815ea208d 100755 --- a/scripts/deleteuser.php +++ b/scripts/deleteuser.php @@ -33,7 +33,7 @@ deletes a user from the database END_OF_DELETEUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php index 9c5e3cf8b3..05638cda4c 100644 --- a/scripts/dumpschema.php +++ b/scripts/dumpschema.php @@ -34,7 +34,7 @@ Attempt to pull a schema definition for a given table. END_OF_CHECKSCHEMA_HELP; $longoptions = array('diff', 'all', 'create', 'update', 'raw', 'checksum'); -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function indentOptions($indent) { @@ -250,4 +250,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 07ada7f9d9..c029b1e7d4 100755 --- a/scripts/fixup_deletions.php +++ b/scripts/fixup_deletions.php @@ -33,7 +33,7 @@ Stray incompletely deleted items cause various fun problems! END_OF_USERROLE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; /** * Find the highest profile_id currently listed in the notice table; diff --git a/scripts/flushrouter.php b/scripts/flushrouter.php index 51178a725c..a9952b4304 100644 --- a/scripts/flushrouter.php +++ b/scripts/flushrouter.php @@ -26,9 +26,9 @@ Flush the url router from cache. END_OF_FLUSHROUTER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $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 b7f385ac45..3950fb7cf7 100644 --- a/scripts/flushsite.php +++ b/scripts/flushsite.php @@ -29,7 +29,7 @@ Flush the site with the given name from memcached. END_OF_FLUSHSITE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $nickname = common_config('site', 'nickname'); @@ -42,4 +42,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 8274c37c0f..00e845f80d 100755 --- a/scripts/getpiddir.php +++ b/scripts/getpiddir.php @@ -25,6 +25,6 @@ getpiddir.php - print out the currently configured PID directory ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; echo common_config('daemon', 'piddir'); diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php index 9b97b62313..7d000bad03 100755 --- a/scripts/getvaliddaemons.php +++ b/scripts/getvaliddaemons.php @@ -36,7 +36,7 @@ ENDOFHELP; // No error reporting to avoid invalid daemon names error_reporting(0); -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $daemons = array(); diff --git a/scripts/gnusocialversion.php b/scripts/gnusocialversion.php index dbe9c54c5b..91c2dc7f64 100644 --- a/scripts/gnusocialversion.php +++ b/scripts/gnusocialversion.php @@ -28,6 +28,6 @@ prints out the current version of the software END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; print GNUSOCIAL_VERSION."\n"; diff --git a/scripts/handlequeued.php b/scripts/handlequeued.php index eb7d829713..3b272868c0 100755 --- a/scripts/handlequeued.php +++ b/scripts/handlequeued.php @@ -28,7 +28,7 @@ as if it were being run through the queue. END_OF_QUEUE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (count($args) != 2) { show_help(); diff --git a/scripts/imdaemon.php b/scripts/imdaemon.php index 0298c00522..7d9ff1fe7d 100755 --- a/scripts/imdaemon.php +++ b/scripts/imdaemon.php @@ -33,7 +33,7 @@ Daemon script for receiving new notices from IM users. END_OF_IM_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; class ImDaemon extends SpawningDaemon { diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php index a29526f27e..d121179f47 100644 --- a/scripts/importtwitteratom.php +++ b/scripts/importtwitteratom.php @@ -33,7 +33,7 @@ import an Atom feed from Twitter as notices by a user END_OF_IMPORTTWITTERATOM_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; function getAtomFeedDocument() diff --git a/scripts/joingroup.php b/scripts/joingroup.php index bd73cbe794..df9aad10ed 100644 --- a/scripts/joingroup.php +++ b/scripts/joingroup.php @@ -34,7 +34,7 @@ Adds a local user to a local group. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; try { $user = getUser(); diff --git a/scripts/leavegroup.php b/scripts/leavegroup.php index 8f9ef33e7e..fd1362ef5e 100644 --- a/scripts/leavegroup.php +++ b/scripts/leavegroup.php @@ -34,7 +34,7 @@ Removes a local user from a local group. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; try { $user = getUser(); diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php index 3b1ef96a1e..5e9b6d2232 100755 --- a/scripts/maildaemon.php +++ b/scripts/maildaemon.php @@ -26,7 +26,7 @@ as STDIN. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; require_once INSTALLDIR.'/lib/mailhandler.php'; if (common_config('emailpost', 'enabled')) { diff --git a/scripts/make-release.php b/scripts/make-release.php index 157cae067d..a3d9c70eb0 100644 --- a/scripts/make-release.php +++ b/scripts/make-release.php @@ -22,7 +22,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $base = INSTALLDIR; $encBase = escapeshellarg($base); diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php index 345d93c665..3d3b1d3e84 100644 --- a/scripts/makegroupadmin.php +++ b/scripts/makegroupadmin.php @@ -32,7 +32,7 @@ makes a user the admin of a group END_OF_MAKEGROUPADMIN_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $nickname = get_option_value('n', 'nickname'); $groupname = get_option_value('g', 'group'); diff --git a/scripts/moveuser.php b/scripts/moveuser.php index 17b3e0fb67..ff08ee24ce 100644 --- a/scripts/moveuser.php +++ b/scripts/moveuser.php @@ -37,7 +37,7 @@ an HTTP or HTTPS URL (http://example.com/social/site/user/nickname). END_OF_MOVEUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; try { diff --git a/scripts/queuectl.php b/scripts/queuectl.php index 1c9ea33536..7524dabb15 100755 --- a/scripts/queuectl.php +++ b/scripts/queuectl.php @@ -45,7 +45,7 @@ Global events: END_OF_QUEUECTL_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function doSendControl($message, $event, $param='') { diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index 582a3dd888..bdd630f3d5 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -68,7 +68,7 @@ Daemon script for running queued items. END_OF_QUEUE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; require_once(INSTALLDIR.'/lib/daemon.php'); require_once(INSTALLDIR.'/classes/Queue_item.php'); diff --git a/scripts/registeruser.php b/scripts/registeruser.php index d2a47b6be9..e212049bec 100644 --- a/scripts/registeruser.php +++ b/scripts/registeruser.php @@ -34,7 +34,7 @@ registers a user in the database END_OF_REGISTERUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $nickname = get_option_value('n', 'nickname'); $password = get_option_value('w', 'password'); diff --git a/scripts/restoreuser.php b/scripts/restoreuser.php index 17f007b412..c749b41a12 100644 --- a/scripts/restoreuser.php +++ b/scripts/restoreuser.php @@ -33,7 +33,7 @@ neither ID or name provided, will create a new user. END_OF_RESTOREUSER_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; diff --git a/scripts/sendemail.php b/scripts/sendemail.php index 0441bfe7ee..9b89cbce7e 100755 --- a/scripts/sendemail.php +++ b/scripts/sendemail.php @@ -33,7 +33,7 @@ Sends given email text to user. END_OF_USEREMAIL_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); diff --git a/scripts/sessiongc.php b/scripts/sessiongc.php index af55ddf3f0..ef452fdb06 100644 --- a/scripts/sessiongc.php +++ b/scripts/sessiongc.php @@ -27,7 +27,7 @@ Delete old sessions from the server END_OF_GC_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $maxlifetime = ini_get('session.gc_maxlifetime'); diff --git a/scripts/setconfig.php b/scripts/setconfig.php index 009c50dbf2..dc6843b92d 100755 --- a/scripts/setconfig.php +++ b/scripts/setconfig.php @@ -39,7 +39,7 @@ With no args, lists all currently set values. END_OF_SETCONFIG_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (empty($args)) { if (have_option('a', 'all')) { diff --git a/scripts/setpassword.php b/scripts/setpassword.php index 3e9f5c17ca..ef439488b2 100755 --- a/scripts/setpassword.php +++ b/scripts/setpassword.php @@ -27,7 +27,7 @@ Sets the password of user with name to END_OF_PASSWORD_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (count($args) < 2) { show_help(); diff --git a/scripts/settag.php b/scripts/settag.php index 19abce43c8..3c234f2c31 100644 --- a/scripts/settag.php +++ b/scripts/settag.php @@ -31,7 +31,7 @@ With -d, delete the tag. END_OF_SETTAG_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (count($args) < 1) { show_help(); diff --git a/scripts/showcache.php b/scripts/showcache.php index 8ef08467d6..b4fe7b63ce 100644 --- a/scripts/showcache.php +++ b/scripts/showcache.php @@ -33,7 +33,7 @@ shows the cached object based on the args ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $karg = get_option_value('k'); diff --git a/scripts/showplugins.php b/scripts/showplugins.php index e79b4e7224..8b950eb0aa 100755 --- a/scripts/showplugins.php +++ b/scripts/showplugins.php @@ -20,7 +20,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; foreach (StatusNet::getActivePlugins() as $plugin=>$args) { echo "$plugin: "; diff --git a/scripts/showtable.php b/scripts/showtable.php index eb18a98e20..986260e1d2 100644 --- a/scripts/showtable.php +++ b/scripts/showtable.php @@ -26,7 +26,7 @@ Shows the structure of a table END_OF_SHOWTABLE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (count($args) != 1) { show_help(); diff --git a/scripts/strip_geo.php b/scripts/strip_geo.php index 021b668851..165736816d 100755 --- a/scripts/strip_geo.php +++ b/scripts/strip_geo.php @@ -36,7 +36,7 @@ Removes geolocation info from the given user's notices. END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php index b5955fd5aa..6cd2101ad7 100644 --- a/scripts/uncache_users.php +++ b/scripts/uncache_users.php @@ -26,7 +26,7 @@ Uncache users listed in an ID file, default 'ids.txt'. ENDOFHELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $id_file = (count($args) > 1) ? $args[0] : 'ids.txt'; diff --git a/scripts/updatelocation.php b/scripts/updatelocation.php index abf9627cc7..c8024cb769 100644 --- a/scripts/updatelocation.php +++ b/scripts/updatelocation.php @@ -34,7 +34,7 @@ set the location for a profile END_OF_UPDATELOCATION_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; try { $user = null; diff --git a/scripts/updateurls.php b/scripts/updateurls.php index 35b835e494..c49187c299 100644 --- a/scripts/updateurls.php +++ b/scripts/updateurls.php @@ -29,7 +29,7 @@ update stored URLs in the system END_OF_UPDATEURLS_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function main() { diff --git a/scripts/upgrade.php b/scripts/upgrade.php index bd4a73d3af..c6f4ade6b6 100644 --- a/scripts/upgrade.php +++ b/scripts/upgrade.php @@ -29,7 +29,7 @@ Upgrade database schema and data to latest software END_OF_UPGRADE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function main() { diff --git a/scripts/useremail.php b/scripts/useremail.php index 02c34678fb..91a9d3152b 100755 --- a/scripts/useremail.php +++ b/scripts/useremail.php @@ -33,7 +33,7 @@ Queries a user's registered email address, or queries the users with a given reg END_OF_USEREMAIL_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); diff --git a/scripts/userrole.php b/scripts/userrole.php index d1061b1832..a5eddeae5f 100644 --- a/scripts/userrole.php +++ b/scripts/userrole.php @@ -34,7 +34,7 @@ modifies a role for the given user END_OF_USERROLE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); diff --git a/tests/atompub/atompub_test.php b/tests/atompub/atompub_test.php index fb675c778e..4259c0cdc7 100644 --- a/tests/atompub/atompub_test.php +++ b/tests/atompub/atompub_test.php @@ -37,7 +37,7 @@ Options: END_OF_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; $user = get_option_value('n', 'nickname'); $pass = get_option_value('p', 'password'); diff --git a/tests/oauth/fetch_temp_creds.php b/tests/oauth/fetch_temp_creds.php index bea512a914..3d8767a6e1 100755 --- a/tests/oauth/fetch_temp_creds.php +++ b/tests/oauth/fetch_temp_creds.php @@ -20,7 +20,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); -require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/scripts/commandline.inc.php'; require_once INSTALLDIR . '/extlib/OAuth.php'; $ini = parse_ini_file("oauth.ini"); diff --git a/tests/oauth/fetch_token_creds.php b/tests/oauth/fetch_token_creds.php index a508c7240c..aac242d0df 100755 --- a/tests/oauth/fetch_token_creds.php +++ b/tests/oauth/fetch_token_creds.php @@ -52,7 +52,7 @@ $helptext = <<