mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge https://github.com/friendica/friendica into pull

pull/569/head^2
friendica 2012-12-29 02:36:19 -08:00
rodzic 05996457f9 14611753cc
commit f962ecdd64
29 zmienionych plików z 45 dodań i 45 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
include/api.php
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

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

4
include/items.php
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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');

6
index.php
Wyświetl plik

@ -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');
}
@ -109,7 +109,7 @@ if((x($_GET,'zrl')) && (! $install)) {
// header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
require("auth.php");
require("include/auth.php");
if(! x($_SESSION,'authenticated'))
header('X-Account-Management-Status: none');

4
mod/_well_known.php
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

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

2
mod/follow.php
Wyświetl plik

@ -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
Wyświetl plik

@ -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
Wyświetl plik

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

2
mod/share.php
Wyświetl plik

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

2
mod/tagrm.php
Wyświetl plik

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

2
mod/wall_upload.php
Wyświetl plik

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

2
util/db_update.php
Wyświetl plik

@ -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);