nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix require_once format

Browse source
This commit is contained in:
Hypolite Petovan 2017-05-07 14:40:23 -04:00
parent fa3fa42d96
commit 82b423c5ac
21 changed files with 104 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/Contact.php
View file

@ -91,11 +91,11 @@ function terminate_friendship($user,$self,$contact) {
/// @TODO Get rid of this, include/datetime.php should care about it by itself /// @TODO Get rid of this, include/datetime.php should care about it by itself
$a = get_app(); $a = get_app();
require_once('include/datetime.php'); require_once 'include/datetime.php';
if ($contact['network'] === NETWORK_OSTATUS) { if ($contact['network'] === NETWORK_OSTATUS) {
require_once('include/ostatus.php'); require_once 'include/ostatus.php';
// create an unfollow slap // create an unfollow slap
$item = array(); $item = array();
@ -104,14 +104,14 @@ function terminate_friendship($user,$self,$contact) {
$slap = ostatus::salmon($item, $user); $slap = ostatus::salmon($item, $user);
if ((x($contact,'notify')) && (strlen($contact['notify']))) { if ((x($contact,'notify')) && (strlen($contact['notify']))) {
require_once('include/salmon.php'); require_once 'include/salmon.php';
slapper($user,$contact['notify'],$slap); slapper($user,$contact['notify'],$slap);
} }
} elseif ($contact['network'] === NETWORK_DIASPORA) { } elseif ($contact['network'] === NETWORK_DIASPORA) {
require_once('include/diaspora.php'); require_once 'include/diaspora.php';
Diaspora::send_unshare($user,$contact); Diaspora::send_unshare($user,$contact);
} elseif ($contact['network'] === NETWORK_DFRN) { } elseif ($contact['network'] === NETWORK_DFRN) {
require_once('include/dfrn.php'); require_once 'include/dfrn.php';
dfrn::deliver($user,$contact,'placeholder', 1); dfrn::deliver($user,$contact,'placeholder', 1);
} }
@ -706,7 +706,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
*/ */
function posts_from_gcontact(App $a, $gcontact_id) { function posts_from_gcontact(App $a, $gcontact_id) {
require_once('include/conversation.php'); require_once 'include/conversation.php';
// There are no posts with "uid = 0" with connector networks // There are no posts with "uid = 0" with connector networks
// This speeds up the query a lot // This speeds up the query a lot
@ -745,7 +745,7 @@ function posts_from_gcontact(App $a, $gcontact_id) {
*/ */
function posts_from_contact_url(App $a, $contact_url) { function posts_from_contact_url(App $a, $contact_url) {
require_once('include/conversation.php'); require_once 'include/conversation.php';
// There are no posts with "uid = 0" with connector networks // There are no posts with "uid = 0" with connector networks
// This speeds up the query a lot // This speeds up the query a lot

6
include/NotificationsManager.php
View file

@ -4,9 +4,9 @@
* @brief Methods for read and write notifications from/to database * @brief Methods for read and write notifications from/to database
* or for formatting notifications * or for formatting notifications
*/ */
require_once('include/html2plain.php'); require_once 'include/html2plain.php';
require_once("include/datetime.php"); require_once 'include/datetime.php';
require_once("include/bbcode.php"); require_once 'include/bbcode.php';
/** /**
* @brief Methods for read and write notifications from/to database * @brief Methods for read and write notifications from/to database

10
include/bb2diaspora.php
View file

@ -4,11 +4,11 @@ use Friendica\App;
use League\HTMLToMarkdown\HtmlConverter; use League\HTMLToMarkdown\HtmlConverter;
require_once "include/oembed.php"; require_once 'include/oembed.php';
require_once "include/event.php"; require_once 'include/event.php';
require_once "library/markdown.php"; require_once 'library/markdown.php';
require_once "include/html2bbcode.php"; require_once 'include/html2bbcode.php';
require_once "include/bbcode.php"; require_once 'include/bbcode.php';
/** /**
* @brief Callback function to replace a Diaspora style mention in a mention for Friendica * @brief Callback function to replace a Diaspora style mention in a mention for Friendica

14
include/cronjobs.php
View file

@ -6,14 +6,14 @@ use Friendica\Core\Config;
function cronjobs_run(&$argv, &$argc){ function cronjobs_run(&$argv, &$argc){
global $a; global $a;
require_once('include/datetime.php');
require_once('include/ostatus.php');
require_once('include/post_update.php');
require_once('mod/nodeinfo.php');
require_once('include/photos.php');
require_once('include/user.php');
require_once('include/socgraph.php');
require_once('include/Probe.php'); require_once('include/Probe.php');
require_once 'include/datetime.php';
require_once 'include/ostatus.php';
require_once 'include/post_update.php';
require_once 'mod/nodeinfo.php';
require_once 'include/photos.php';
require_once 'include/user.php';
require_once 'include/socgraph.php';
// No parameter set? So return // No parameter set? So return
if ($argc <= 1) { if ($argc <= 1) {

20
include/delivery.php
View file

@ -3,20 +3,20 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once('include/queue_fn.php');
require_once('include/html2plain.php');
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/diaspora.php'); require_once 'include/queue_fn.php';
require_once('include/ostatus.php'); require_once 'include/html2plain.php';
require_once('include/dfrn.php'); require_once 'include/diaspora.php';
require_once 'include/ostatus.php';
require_once 'include/dfrn.php';
function delivery_run(&$argv, &$argc){ function delivery_run(&$argv, &$argc){
global $a; global $a;
require_once('include/datetime.php'); require_once 'include/datetime.php';
require_once('include/items.php'); require_once 'include/items.php';
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/email.php'); require_once 'include/email.php';
if ($argc < 3) { if ($argc < 3) {
return; return;
@ -166,7 +166,7 @@ function delivery_run(&$argv, &$argc){
$public_message = true; $public_message = true;
if (!($mail || $fsuggest || $relocate)) { if (!($mail || $fsuggest || $relocate)) {
require_once('include/group.php'); require_once 'include/group.php';
$parent = $items[0]; $parent = $items[0];

2
include/event.php
View file

@ -88,7 +88,7 @@ function format_event_html($ev, $simple = false) {
function parse_event($h) { function parse_event($h) {
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/html2bbcode'); require_once 'include/html2bbcode';
$h = '<html><body>' . $h . '</body></html>'; $h = '<html><body>' . $h . '</body></html>';

12
include/follow.php
View file

@ -3,12 +3,12 @@
use Friendica\App; use Friendica\App;
require_once("include/Scrape.php"); require_once("include/Scrape.php");
require_once("include/socgraph.php"); require_once 'include/socgraph.php';
require_once('include/group.php'); require_once 'include/group.php';
require_once('include/salmon.php'); require_once 'include/salmon.php';
require_once('include/ostatus.php'); require_once 'include/ostatus.php';
require_once("include/Photo.php"); require_once 'include/Photo.php';
require_once('include/diaspora.php'); require_once 'include/diaspora.php';
function update_contact($id) { function update_contact($id) {
/* /*

4
include/gprobe.php
View file

@ -3,8 +3,8 @@
use Friendica\Core\Config; use Friendica\Core\Config;
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/socgraph.php'); require_once 'include/socgraph.php';
require_once('include/datetime.php'); require_once 'include/datetime.php';
function gprobe_run(&$argv, &$argc){ function gprobe_run(&$argv, &$argc){
if ($argc != 2) { if ($argc != 2) {

22
include/notifier.php
View file

@ -3,12 +3,12 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once('include/queue_fn.php');
require_once('include/html2plain.php');
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/diaspora.php'); require_once 'include/queue_fn.php';
require_once('include/ostatus.php'); require_once 'include/html2plain.php';
require_once('include/salmon.php'); require_once 'include/diaspora.php';
require_once 'include/ostatus.php';
require_once 'include/salmon.php';
/* /*
* This file was at one time responsible for doing all deliveries, but this caused * This file was at one time responsible for doing all deliveries, but this caused
@ -46,10 +46,10 @@ require_once('include/salmon.php');
function notifier_run(&$argv, &$argc){ function notifier_run(&$argv, &$argc){
global $a; global $a;
require_once('include/datetime.php'); require_once 'include/datetime.php';
require_once('include/items.php'); require_once 'include/items.php';
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/email.php'); require_once 'include/email.php';
if ($argc < 3) { if ($argc < 3) {
return; return;
@ -139,7 +139,7 @@ function notifier_run(&$argv, &$argc){
if (!$r) { if (!$r) {
return; return;
} }
require_once('include/Contact.php'); require_once 'include/Contact.php';
foreach ($r as $contact) { foreach ($r as $contact) {
terminate_friendship($user, $self, $contact); terminate_friendship($user, $self, $contact);
} }
@ -223,7 +223,7 @@ function notifier_run(&$argv, &$argc){
$slap = ostatus::salmon($target_item,$owner); $slap = ostatus::salmon($target_item,$owner);
require_once('include/group.php'); require_once 'include/group.php';
$parent = $items[0]; $parent = $items[0];

28
include/ostatus.php
View file

@ -5,21 +5,21 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once("include/Contact.php");
require_once("include/threads.php");
require_once("include/html2bbcode.php");
require_once("include/bbcode.php");
require_once("include/items.php");
require_once("mod/share.php");
require_once("include/enotify.php");
require_once("include/socgraph.php");
require_once("include/Photo.php");
require_once("include/Scrape.php"); require_once("include/Scrape.php");
require_once("include/follow.php");
require_once("include/api.php"); require_once 'include/Contact.php';
require_once("mod/proxy.php"); require_once 'include/threads.php';
require_once("include/xml.php"); require_once 'include/html2bbcode.php';
require_once 'include/bbcode.php';
require_once 'include/items.php';
require_once 'mod/share.php';
require_once 'include/enotify.php';
require_once 'include/socgraph.php';
require_once 'include/Photo.php';
require_once 'include/follow.php';
require_once 'include/api.php';
require_once 'mod/proxy.php';
require_once 'include/xml.php';
/** /**
* @brief This class contain functions for the OStatus protocol * @brief This class contain functions for the OStatus protocol

2
include/salmon.php
View file

@ -1,6 +1,6 @@
<?php <?php
require_once('include/crypto.php'); require_once 'include/crypto.php';
require_once('include/Probe.php'); require_once('include/Probe.php');
function get_salmon_key($uri, $keyhash) { function get_salmon_key($uri, $keyhash) {

12
include/socgraph.php
View file

@ -9,13 +9,13 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once('include/datetime.php');
require_once("include/Scrape.php"); require_once("include/Scrape.php");
require_once("include/network.php");
require_once("include/html2bbcode.php"); require_once 'include/datetime.php';
require_once("include/Contact.php"); require_once 'include/network.php';
require_once("include/Photo.php"); require_once 'include/html2bbcode.php';
require_once 'include/Contact.php';
require_once 'include/Photo.php';
/** /**
* @brief Fetch POCO data * @brief Fetch POCO data

16
mod/contacts.php
View file

@ -2,12 +2,12 @@
use Friendica\App; use Friendica\App;
require_once('include/Contact.php');
require_once('include/socgraph.php');
require_once('include/contact_selectors.php');
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('mod/proxy.php'); require_once 'include/Contact.php';
require_once('include/Photo.php'); require_once 'include/socgraph.php';
require_once 'include/contact_selectors.php';
require_once 'mod/proxy.php';
require_once 'include/Photo.php';
function contacts_init(App $a) { function contacts_init(App $a) {
if (! local_user()) { if (! local_user()) {
@ -27,8 +27,8 @@ function contacts_init(App $a) {
} }
} }
require_once('include/group.php'); require_once 'include/group.php';
require_once('include/contact_widgets.php'); require_once 'include/contact_widgets.php';
if ($_GET['nets'] == "all") { if ($_GET['nets'] == "all") {
$_GET['nets'] = ""; $_GET['nets'] = "";
@ -498,7 +498,7 @@ function contacts_content(App $a) {
'$baseurl' => App::get_baseurl(true), '$baseurl' => App::get_baseurl(true),
)); ));
require_once('include/contact_selectors.php'); require_once 'include/contact_selectors.php';
$tpl = get_markup_template("contact_edit.tpl"); $tpl = get_markup_template("contact_edit.tpl");

16
mod/dfrn_confirm.php
View file

@ -20,9 +20,9 @@
use Friendica\App; use Friendica\App;
require_once('include/enotify.php');
require_once('include/group.php');
require_once('include/Probe.php'); require_once('include/Probe.php');
require_once 'include/enotify.php';
require_once 'include/group.php';
function dfrn_confirm_post(App $a, $handsfree = null) { function dfrn_confirm_post(App $a, $handsfree = null) {
@ -154,7 +154,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
* worried about key leakage than anybody cracking it. * worried about key leakage than anybody cracking it.
* *
*/ */
require_once('include/crypto.php'); require_once 'include/crypto.php';
$res = new_keypair(4096); $res = new_keypair(4096);
@ -319,7 +319,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
* *
*/ */
require_once('include/Photo.php'); require_once 'include/Photo.php';
update_contact_avatar($contact['photo'],$uid,$contact_id); update_contact_avatar($contact['photo'],$uid,$contact_id);
@ -435,7 +435,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) { if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) { if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
require_once('include/diaspora.php'); require_once 'include/diaspora.php';
$ret = Diaspora::send_share($user[0],$r[0]); $ret = Diaspora::send_share($user[0],$r[0]);
logger('share returns: ' . $ret); logger('share returns: ' . $ret);
} }
@ -448,7 +448,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
require_once('include/items.php'); require_once 'include/items.php';
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid) intval($uid)
@ -672,7 +672,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
$photo = App::get_baseurl() . '/images/person-175.jpg'; $photo = App::get_baseurl() . '/images/person-175.jpg';
} }
require_once("include/Photo.php"); require_once 'include/Photo.php';
update_contact_avatar($photo,$local_uid,$dfrn_record); update_contact_avatar($photo,$local_uid,$dfrn_record);
@ -752,7 +752,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) { if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
require_once('include/items.php'); require_once 'include/items.php';
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($local_uid) intval($local_uid)

8
mod/dfrn_request.php
View file

@ -14,10 +14,10 @@
use Friendica\App; use Friendica\App;
require_once('include/enotify.php');
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/Probe.php'); require_once('include/Probe.php');
require_once('include/group.php'); require_once 'include/enotify.php';
require_once 'include/group.php';
function dfrn_request_init(App $a) { function dfrn_request_init(App $a) {
@ -522,8 +522,6 @@ function dfrn_request_post(App $a) {
return; // NOTREACHED return; // NOTREACHED
} }
require_once('include/Scrape.php');
$parms = Probe::profile(($hcard) ? $hcard : $url); $parms = Probe::profile(($hcard) ? $hcard : $url);
if (! count($parms)) { if (! count($parms)) {
@ -767,7 +765,7 @@ function dfrn_request_content(App $a) {
} }
if($auto_confirm) { if($auto_confirm) {
require_once('mod/dfrn_confirm.php'); require_once 'mod/dfrn_confirm.php';
$handsfree = array( $handsfree = array(
'uid' => $r[0]['uid'], 'uid' => $r[0]['uid'],
'node' => $r[0]['nickname'], 'node' => $r[0]['nickname'],

6
mod/follow.php
View file

@ -3,9 +3,9 @@
use Friendica\App; use Friendica\App;
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/follow.php'); require_once 'include/follow.php';
require_once('include/Contact.php'); require_once 'include/Contact.php';
require_once('include/contact_selectors.php'); require_once 'include/contact_selectors.php';
function follow_content(App $a) { function follow_content(App $a) {

2
mod/item.php
View file

@ -144,7 +144,6 @@ function item_post(App $a) {
$parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]); $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
if (!isset($parent_contact["nick"])) { if (!isset($parent_contact["nick"])) {
require_once 'include/Scrape.php';
$probed_contact = probe_url($thrparent[0]["author-link"]); $probed_contact = probe_url($thrparent[0]["author-link"]);
if ($probed_contact["network"] != NETWORK_FEED) { if ($probed_contact["network"] != NETWORK_FEED) {
$parent_contact = $probed_contact; $parent_contact = $probed_contact;
@ -1106,7 +1105,6 @@ function item_content(App $a) {
* @return boolean true if replaced, false if not replaced * @return boolean true if replaced, false if not replaced
*/ */
function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") { function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
require_once 'include/Scrape.php';
require_once 'include/socgraph.php'; require_once 'include/socgraph.php';
$replaced = false; $replaced = false;

2
mod/ostatus_subscribe.php
View file

@ -3,7 +3,7 @@
use Friendica\App; use Friendica\App;
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/follow.php'); require_once 'include/follow.php';
function ostatus_subscribe_content(App $a) { function ostatus_subscribe_content(App $a) {

6
mod/photos.php
View file

@ -982,9 +982,9 @@ function photos_content(App $a) {
return; return;
} }
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/security.php'); require_once 'include/security.php';
require_once('include/conversation.php'); require_once 'include/conversation.php';
if (! x($a->data,'user')) { if (! x($a->data,'user')) {
notice( t('No photos selected') . EOL ); notice( t('No photos selected') . EOL );

8
mod/profiles.php
View file

@ -2,7 +2,7 @@
use Friendica\App; use Friendica\App;
require_once("include/Contact.php"); require_once 'include/Contact.php';
require_once('include/Probe.php'); require_once('include/Probe.php');
function profiles_init(App $a) { function profiles_init(App $a) {
@ -504,7 +504,7 @@ function profiles_post(App $a) {
proc_run(PRIORITY_LOW, "include/directory.php", $url); proc_run(PRIORITY_LOW, "include/directory.php", $url);
} }
require_once('include/profile_update.php'); require_once 'include/profile_update.php';
profile_change(); profile_change();
// Update the global contact for the user // Update the global contact for the user
@ -529,7 +529,7 @@ function profile_activity($changed, $value) {
return; return;
} }
require_once('include/items.php'); require_once 'include/items.php';
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval(local_user()) intval(local_user())
@ -623,7 +623,7 @@ function profiles_content(App $a) {
return; return;
} }
require_once('include/profile_selectors.php'); require_once 'include/profile_selectors.php';
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array( $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(

2
mod/repair_ostatus.php
View file

@ -3,7 +3,7 @@
use Friendica\App; use Friendica\App;
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/follow.php'); require_once 'include/follow.php';
function repair_ostatus_content(App $a) { function repair_ostatus_content(App $a) {