friendica
/
friendica
mirror of https://github.com/friendica/friendica.git
5
7
Fork 5
Code Issues Releases 16 Wiki Activity
Browse Source

use explicit include paths

pull/567/head
Zach Prezkuta 10 years ago
parent
f03ac60725
commit
e684324032
29 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      include/api.php
  2. 2
      include/conversation.php
  3. 2
      include/cronhooks.php
  4. 6
      include/delivery.php
  5. 2
      include/directory.php
  6. 2
      include/enotify.php
  7. 2
      include/expire.php
  8. 2
      include/follow.php
  9. 2
      include/gprobe.php
  10. 2
      include/html2plain.php
  11. 4
      include/items.php
  12. 6
      include/notifier.php
  13. 2
      include/onepoll.php
  14. 2
      include/poller.php
  15. 6
      include/queue.php
  16. 4
      index.php
  17. 4
      mod/_well_known.php
  18. 2
      mod/content.php
  19. 2
      mod/crepair.php
  20. 2
      mod/dfrn_confirm.php
  21. 4
      mod/dfrn_request.php
  22. 2
      mod/editpost.php
  23. 2
      mod/follow.php
  24. 4
      mod/install.php
  25. 2
      mod/profile_photo.php
  26. 2
      mod/share.php
  27. 2
      mod/tagrm.php
  28. 2
      mod/wall_upload.php
  29. 2
      util/db_update.php

10
include/api.php
Unescape View File

@ -1,9 +1,9 @@
<?php
require_once("bbcode.php");
require_once("datetime.php");
require_once("conversation.php");
require_once("oauth.php");
require_once("html2plain.php");
require_once("include/bbcode.php");
require_once("include/datetime.php");
require_once("include/conversation.php");
require_once("include/oauth.php");
require_once("include/html2plain.php");
/*
* Twitter-Like API
*

2
include/conversation.php
Unescape View File

@ -369,7 +369,7 @@ if(!function_exists('conversation')) {
function conversation(&$a, $items, $mode, $update, $preview = false) {
require_once('bbcode.php');
require_once('include/bbcode.php');
$ssl_state = ((local_user()) ? true : false);

2
include/cronhooks.php
Unescape View File

@ -12,7 +12,7 @@ function cronhooks_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};

6
include/delivery.php
Unescape View File

@ -12,13 +12,13 @@ function delivery_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
}
require_once("session.php");
require_once("datetime.php");
require_once("include/session.php");
require_once("include/datetime.php");
require_once('include/items.php');
require_once('include/bbcode.php');
require_once('include/diaspora.php');

2
include/directory.php
Unescape View File

@ -10,7 +10,7 @@ function directory_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};

2
include/enotify.php
Unescape View File

@ -310,7 +310,7 @@ function notification($params) {
// send email notification if notification preferences permit
require_once('bbcode.php');
require_once('include/bbcode.php');
if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
logger('notification: sending notification email');

2
include/expire.php
Unescape View File

@ -11,7 +11,7 @@ function expire_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};

2
include/follow.php
Unescape View File

@ -218,7 +218,7 @@ function new_contact($uid,$url,$interactive = false) {
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
}
require_once("Photo.php");
require_once("include/Photo.php");
$photos = import_profile_photo($ret['photo'],$uid,$contact_id);

2
include/gprobe.php
Unescape View File

@ -13,7 +13,7 @@ function gprobe_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};

2
include/html2plain.php
Unescape View File

@ -1,5 +1,5 @@
<?php
require_once "html2bbcode.php";
require_once("include/html2bbcode.php");
function breaklines($line, $level, $wraplength = 75)
{

4
include/items.php
Unescape View File

@ -1607,7 +1607,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
logger('consume_feed: Updating photo for ' . $contact['name']);
require_once("Photo.php");
require_once("include/Photo.php");
$photo_failure = false;
$have_photo = false;
@ -2240,7 +2240,7 @@ function local_delivery($importer,$data) {
if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
logger('local_delivery: Updating photo for ' . $importer['name']);
require_once("Photo.php");
require_once("include/Photo.php");
$photo_failure = false;
$have_photo = false;

6
include/notifier.php
Unescape View File

@ -51,13 +51,13 @@ function notifier_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
}
require_once("session.php");
require_once("datetime.php");
require_once("include/session.php");
require_once("include/datetime.php");
require_once('include/items.php');
require_once('include/bbcode.php');
require_once('include/email.php');

2
include/onepoll.php
Unescape View File

@ -18,7 +18,7 @@ function onepoll_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};

2
include/poller.php
Unescape View File

@ -12,7 +12,7 @@ function poller_run(&$argv, &$argc){
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};

6
include/queue.php
Unescape View File

@ -11,14 +11,14 @@ function queue_run(&$argv, &$argc){
if(is_null($db)){
@include(".htconfig.php");
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};
require_once("session.php");
require_once("datetime.php");
require_once("include/session.php");
require_once("include/datetime.php");
require_once('include/items.php');
require_once('include/bbcode.php');

4
index.php
Unescape View File

@ -41,7 +41,7 @@ load_translation_table($lang);
*
*/
require_once("dba.php");
require_once("include/dba.php");
if(! $install) {
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
@ -54,7 +54,7 @@ if(! $install) {
load_config('config');
load_config('system');
require_once("session.php");
require_once("include/session.php");
load_hooks();
call_hooks('init_1');
}

4
mod/_well_known.php
Unescape View File

@ -1,5 +1,5 @@
<?php
require_once("hostxrd.php");
require_once("mod/hostxrd.php");
function _well_known_init(&$a){
if ($a->argc > 1) {
@ -11,4 +11,4 @@ function _well_known_init(&$a){
}
http_status_exit(404);
killme();
}
}

2
mod/content.php
Unescape View File

@ -309,7 +309,7 @@ function content_content(&$a, $update = 0) {
function render_content(&$a, $items, $mode, $update, $preview = false) {
require_once('bbcode.php');
require_once('include/bbcode.php');
$ssl_state = ((local_user()) ? true : false);

2
mod/crepair.php
Unescape View File

@ -76,7 +76,7 @@ function crepair_post(&$a) {
if($photo) {
logger('mod-crepair: updating photo from ' . $photo);
require_once("Photo.php");
require_once("include/Photo.php");
$photos = import_profile_photo($photo,local_user(),$contact['id']);

2
mod/dfrn_confirm.php
Unescape View File

@ -671,7 +671,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
else
$photo = $a->get_baseurl() . '/images/person-175.jpg';
require_once("Photo.php");
require_once("include/Photo.php");
$photos = import_profile_photo($photo,$local_uid,$dfrn_record);

4
mod/dfrn_request.php
Unescape View File

@ -110,7 +110,7 @@ function dfrn_request_post(&$a) {
* Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
*/
require_once('Scrape.php');
require_once('include/Scrape.php');
$parms = scrape_dfrn($dfrn_url);
@ -505,7 +505,7 @@ function dfrn_request_post(&$a) {
}
require_once('Scrape.php');
require_once('include/Scrape.php');
$parms = scrape_dfrn(($hcard) ? $hcard : $url);

2
mod/editpost.php
Unescape View File

@ -1,6 +1,6 @@
<?php
require_once('acl_selectors.php');
require_once('include/acl_selectors.php');
function editpost_content(&$a) {

2
mod/follow.php
Unescape View File

@ -1,6 +1,6 @@
<?php
require_once('Scrape.php');
require_once('include/Scrape.php');
require_once('include/follow.php');
function follow_init(&$a) {

4
mod/install.php
Unescape View File

@ -32,7 +32,7 @@ function install_post(&$a) {
$dbdata = notags(trim($_POST['dbdata']));
$phpath = notags(trim($_POST['phpath']));
require_once("dba.php");
require_once("include/dba.php");
unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
/*if(get_db_errno()) {
@ -251,7 +251,7 @@ function install_content(&$a) {
return $o;
}; break;
case 3: { // Site settings
require_once('datetime.php');
require_once('include/datetime.php');
$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
$dbuser = notags(trim($_POST['dbuser']));
$dbpass = notags(trim($_POST['dbpass']));

2
mod/profile_photo.php
Unescape View File

@ -1,6 +1,6 @@
<?php
require_once("Photo.php");
require_once("include/Photo.php");
function profile_photo_init(&$a) {

2
mod/share.php
Unescape View File

@ -1,6 +1,6 @@
<?php
require_once('bbcode.php');
require_once('include/bbcode.php');
function share_init(&$a) {

2
mod/tagrm.php
Unescape View File

@ -1,6 +1,6 @@
<?php
require_once('bbcode.php');
require_once('include/bbcode.php');
function tagrm_post(&$a) {

2
mod/wall_upload.php
Unescape View File

@ -1,6 +1,6 @@
<?php
require_once('Photo.php');
require_once('include/Photo.php');
function wall_upload_post(&$a) {

2
util/db_update.php
Unescape View File

@ -14,7 +14,7 @@ $a = new App;
$lang = get_browser_language();
load_translation_table($lang);
require_once("dba.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
unset($db_host, $db_user, $db_pass, $db_data);

Write Preview
Loading…
Cancel
Save