friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Standard stuff

This commit is contained in:
Michael 2017-03-14 15:17:21 +00:00
parent 49b22de705
commit f73389dd12
11 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/cron.php
View File

@ -1,8 +1,8 @@
<?php <?php
use \Friendica\Core\Config; use \Friendica\Core\Config;
require_once("include/photos.php"); require_once('include/photos.php');
require_once("include/user.php"); require_once('include/user.php');
function cron_run(&$argv, &$argc){ function cron_run(&$argv, &$argc){
global $a; global $a;

2
include/cronhooks.php
View File

@ -16,7 +16,7 @@ function cronhooks_run(&$argv, &$argc){
return; return;
} }
$last = get_config('system','last_cronhook'); $last = get_config('system', 'last_cronhook');
$poll_interval = intval(get_config('system','cronhook_interval')); $poll_interval = intval(get_config('system','cronhook_interval'));
if(! $poll_interval) if(! $poll_interval)

2
include/dbupdate.php
View File

@ -7,7 +7,7 @@ function dbupdate_run(&$argv, &$argc) {
// We are deleting the latest dbupdate entry. // We are deleting the latest dbupdate entry.
// This is done to avoid endless loops because the update was interupted. // This is done to avoid endless loops because the update was interupted.
Config::delete('database','dbupdate_'.DB_UPDATE_VERSION); Config::delete('database', 'dbupdate_'.DB_UPDATE_VERSION);
update_db($a); update_db($a);
} }

8
include/delivery.php
View File

@ -4,15 +4,15 @@ use \Friendica\Core\Config;
require_once('include/queue_fn.php'); require_once('include/queue_fn.php');
require_once('include/html2plain.php'); require_once('include/html2plain.php');
require_once("include/Scrape.php"); require_once('include/Scrape.php');
require_once('include/diaspora.php'); require_once('include/diaspora.php');
require_once("include/ostatus.php"); require_once('include/ostatus.php');
require_once("include/dfrn.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');

2
include/directory.php
View File

@ -6,7 +6,7 @@ function directory_run(&$argv, &$argc){
return; return;
} }
$dir = get_config('system','directory'); $dir = get_config('system', 'directory');
if (!strlen($dir)) { if (!strlen($dir)) {
return; return;

2
include/discover_poco.php
View File

@ -2,7 +2,7 @@
use \Friendica\Core\Config; use \Friendica\Core\Config;
require_once("include/socgraph.php"); require_once('include/socgraph.php');
require_once('include/datetime.php'); require_once('include/datetime.php');
function discover_poco_run(&$argv, &$argc){ function discover_poco_run(&$argv, &$argc){

4
include/gprobe.php
View File

@ -7,9 +7,9 @@ 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) {
return; return;
}
$url = hex2bin($argv[1]); $url = hex2bin($argv[1]);
$r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1", $r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",

6
include/notifier.php
View File

@ -4,9 +4,9 @@ use \Friendica\Core\Config;
require_once('include/queue_fn.php'); require_once('include/queue_fn.php');
require_once('include/html2plain.php'); require_once('include/html2plain.php');
require_once("include/Scrape.php"); require_once('include/Scrape.php');
require_once('include/diaspora.php'); require_once('include/diaspora.php');
require_once("include/ostatus.php"); require_once('include/ostatus.php');
require_once('include/salmon.php'); require_once('include/salmon.php');
/* /*
@ -45,7 +45,7 @@ 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');

2
include/onepoll.php
View File

@ -2,7 +2,7 @@
use \Friendica\Core\Config; use \Friendica\Core\Config;
require_once("include/follow.php"); require_once('include/follow.php');
function RemoveReply($subject) { function RemoveReply($subject) {
while (in_array(strtolower(substr($subject, 0, 3)), array("re:", "aw:"))) while (in_array(strtolower(substr($subject, 0, 3)), array("re:", "aw:")))

2
include/pubsubpublish.php
View File

@ -2,7 +2,7 @@
use \Friendica\Core\Config; use \Friendica\Core\Config;
require_once('include/items.php'); require_once('include/items.php');
require_once("include/ostatus.php"); require_once('include/ostatus.php');
function pubsubpublish_run(&$argv, &$argc){ function pubsubpublish_run(&$argv, &$argc){

7
include/update_gcontact.php
View File

@ -6,14 +6,15 @@ function update_gcontact_run(&$argv, &$argc){
global $a; global $a;
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once("include/socgraph.php"); require_once('include/socgraph.php');
logger('update_gcontact: start'); logger('update_gcontact: start');
if(($argc > 1) && (intval($argv[1]))) if (($argc > 1) && (intval($argv[1]))) {
$contact_id = intval($argv[1]); $contact_id = intval($argv[1]);
}
if(!$contact_id) { if (!$contact_id) {
logger('update_gcontact: no contact'); logger('update_gcontact: no contact');
return; return;
} }