Merge remote-tracking branch 'upstream/develop' into 1701-curl-range
Conflicts: mod/oexchange.php mod/uimport.php
This commit is contained in:
commit
e67133ef56
2
LICENSE
2
LICENSE
|
|
@ -1,5 +1,5 @@
|
||||||
Friendica Communications Server
|
Friendica Communications Server
|
||||||
Copyright (c) 2010-2016 the Friendica Project
|
Copyright (c) 2010-2017 the Friendica Project
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
|
|
||||||
8
boot.php
8
boot.php
|
|
@ -1540,7 +1540,7 @@ function check_db() {
|
||||||
* Sets the base url for use in cmdline programs which don't have
|
* Sets the base url for use in cmdline programs which don't have
|
||||||
* $_SERVER variables
|
* $_SERVER variables
|
||||||
*/
|
*/
|
||||||
function check_url(App &$a) {
|
function check_url(App $a) {
|
||||||
|
|
||||||
$url = get_config('system','url');
|
$url = get_config('system','url');
|
||||||
|
|
||||||
|
|
@ -1562,7 +1562,7 @@ function check_url(App &$a) {
|
||||||
/**
|
/**
|
||||||
* @brief Automatic database updates
|
* @brief Automatic database updates
|
||||||
*/
|
*/
|
||||||
function update_db(App &$a) {
|
function update_db(App $a) {
|
||||||
$build = get_config('system','build');
|
$build = get_config('system','build');
|
||||||
if(! x($build))
|
if(! x($build))
|
||||||
$build = set_config('system','build',DB_UPDATE_VERSION);
|
$build = set_config('system','build',DB_UPDATE_VERSION);
|
||||||
|
|
@ -1678,7 +1678,7 @@ function run_update_function($x) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function check_plugins(App &$a) {
|
function check_plugins(App $a) {
|
||||||
|
|
||||||
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
|
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r))
|
||||||
|
|
@ -2414,7 +2414,7 @@ function get_temppath() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @deprecated
|
/// @deprecated
|
||||||
function set_template_engine(App &$a, $engine = 'internal') {
|
function set_template_engine(App $a, $engine = 'internal') {
|
||||||
/// @note This function is no longer necessary, but keep it as a wrapper to the class method
|
/// @note This function is no longer necessary, but keep it as a wrapper to the class method
|
||||||
/// to avoid breaking themes again unnecessarily
|
/// to avoid breaking themes again unnecessarily
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ Arguments
|
||||||
---
|
---
|
||||||
Your hook callback functions will be called with at least one and possibly two arguments
|
Your hook callback functions will be called with at least one and possibly two arguments
|
||||||
|
|
||||||
function myhook_function(&$a, &$b) {
|
function myhook_function(App $a, &$b) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -77,9 +77,9 @@ This will include:
|
||||||
$a->argc = 3
|
$a->argc = 3
|
||||||
$a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
|
$a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
|
||||||
|
|
||||||
Your module functions will often contain the function plugin_name_content(App &$a), which defines and returns the page body content.
|
Your module functions will often contain the function plugin_name_content(App $a), which defines and returns the page body content.
|
||||||
They may also contain plugin_name_post(App &$a) which is called before the _content function and typically handles the results of POST forms.
|
They may also contain plugin_name_post(App $a) which is called before the _content function and typically handles the results of POST forms.
|
||||||
You may also have plugin_name_init(App &$a) which is called very early on and often does module initialisation.
|
You may also have plugin_name_init(App $a) which is called very early on and often does module initialisation.
|
||||||
|
|
||||||
Templates
|
Templates
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ The code will be something like:
|
||||||
file: mod/network.php
|
file: mod/network.php
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function network_content(App &$a) {
|
function network_content(App $a) {
|
||||||
$itemsmanager = new \Friendica\ItemsManager();
|
$itemsmanager = new \Friendica\ItemsManager();
|
||||||
$items = $itemsmanager->getAll();
|
$items = $itemsmanager->getAll();
|
||||||
|
|
||||||
|
|
@ -160,7 +160,7 @@ But if you want to use classes from another library, you need to use the full na
|
||||||
|
|
||||||
```
|
```
|
||||||
<?php
|
<?php
|
||||||
namespace \Frienidca;
|
namespace \Friendica;
|
||||||
|
|
||||||
class Diaspora {
|
class Diaspora {
|
||||||
public function md2bbcode() {
|
public function md2bbcode() {
|
||||||
|
|
@ -173,7 +173,7 @@ if you use that class in many places of the code and you don't want to write the
|
||||||
|
|
||||||
```
|
```
|
||||||
<?php
|
<?php
|
||||||
namespace \Frienidca;
|
namespace \Friendica;
|
||||||
|
|
||||||
use \Michelf\MarkdownExtra;
|
use \Michelf\MarkdownExtra;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ Argumente
|
||||||
|
|
||||||
Deine Hook-Callback-Funktion wird mit mindestens einem und bis zu zwei Argumenten aufgerufen
|
Deine Hook-Callback-Funktion wird mit mindestens einem und bis zu zwei Argumenten aufgerufen
|
||||||
|
|
||||||
function myhook_function(&$a, &$b) {
|
function myhook_function(App $a, &$b) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -67,9 +67,9 @@ So würde http://example.com/plugin/arg1/arg2 nach einem Modul "plugin" suchen u
|
||||||
$a->argc = 3
|
$a->argc = 3
|
||||||
$a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
|
$a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
|
||||||
|
|
||||||
Deine Modulfunktionen umfassen oft die Funktion plugin_name_content(App &$a), welche den Seiteninhalt definiert und zurückgibt.
|
Deine Modulfunktionen umfassen oft die Funktion plugin_name_content(App $a), welche den Seiteninhalt definiert und zurückgibt.
|
||||||
Sie können auch plugin_name_post(App &$a) umfassen, welches vor der content-Funktion aufgerufen wird und normalerweise die Resultate der POST-Formulare handhabt.
|
Sie können auch plugin_name_post(App $a) umfassen, welches vor der content-Funktion aufgerufen wird und normalerweise die Resultate der POST-Formulare handhabt.
|
||||||
Du kannst ebenso plugin_name_init(App &$a) nutzen, was oft frühzeitig aufgerufen wird und das Modul initialisert.
|
Du kannst ebenso plugin_name_init(App $a) nutzen, was oft frühzeitig aufgerufen wird und das Modul initialisert.
|
||||||
|
|
||||||
|
|
||||||
Derzeitige Hooks
|
Derzeitige Hooks
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ the 1st part of the line is the name of the CSS file (without the .css) the 2nd
|
||||||
Calling the t() function with the common name makes the string translateable.
|
Calling the t() function with the common name makes the string translateable.
|
||||||
The selected 1st part will be saved in the database by the theme_post function.
|
The selected 1st part will be saved in the database by the theme_post function.
|
||||||
|
|
||||||
function theme_post(App &$a){
|
function theme_post(App $a){
|
||||||
// non local users shall not pass
|
// non local users shall not pass
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -168,7 +168,7 @@ The content of this file should be something like
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
/* meta informations for the theme, see below */
|
/* meta informations for the theme, see below */
|
||||||
function duepuntozero_lr_init(App &$a) {
|
function duepuntozero_lr_init(App $a) {
|
||||||
$a-> theme_info = array(
|
$a-> theme_info = array(
|
||||||
'extends' => 'duepuntozero'.
|
'extends' => 'duepuntozero'.
|
||||||
);
|
);
|
||||||
|
|
@ -251,7 +251,7 @@ Next crucial part of the theme.php file is a definition of an init function.
|
||||||
The name of the function is <theme-name>_init.
|
The name of the function is <theme-name>_init.
|
||||||
So in the case of quattro it is
|
So in the case of quattro it is
|
||||||
|
|
||||||
function quattro_init(App &$a) {
|
function quattro_init(App $a) {
|
||||||
$a->theme_info = array();
|
$a->theme_info = array();
|
||||||
set_template_engine($a, 'smarty3');
|
set_template_engine($a, 'smarty3');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -612,7 +612,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
|
||||||
*
|
*
|
||||||
* @return string posts in HTML
|
* @return string posts in HTML
|
||||||
*/
|
*/
|
||||||
function posts_from_gcontact($a, $gcontact_id) {
|
function posts_from_gcontact(App $a, $gcontact_id) {
|
||||||
|
|
||||||
require_once('include/conversation.php');
|
require_once('include/conversation.php');
|
||||||
|
|
||||||
|
|
@ -664,7 +664,7 @@ function posts_from_gcontact($a, $gcontact_id) {
|
||||||
*
|
*
|
||||||
* @return string posts in HTML
|
* @return string posts in HTML
|
||||||
*/
|
*/
|
||||||
function posts_from_contact_url($a, $contact_url) {
|
function posts_from_contact_url(App $a, $contact_url) {
|
||||||
|
|
||||||
require_once('include/conversation.php');
|
require_once('include/conversation.php');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -943,7 +943,7 @@ function scale_image($width, $height, $max) {
|
||||||
return array("width" => $dest_width, "height" => $dest_height);
|
return array("width" => $dest_width, "height" => $dest_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
function store_photo($a, $uid, $imagedata = "", $url = "") {
|
function store_photo(App $a, $uid, $imagedata = "", $url = "") {
|
||||||
$r = q("SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
|
$r = q("SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
|
||||||
WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
|
WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
|
||||||
|
|
@ -372,7 +372,7 @@ function populate_acl($user = null, $show_jotnets = false) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function construct_acl_data(&$a, $user) {
|
function construct_acl_data(App $a, $user) {
|
||||||
|
|
||||||
// Get group and contact information for html ACL selector
|
// Get group and contact information for html ACL selector
|
||||||
$acl_data = acl_lookup($a, 'html');
|
$acl_data = acl_lookup($a, 'html');
|
||||||
|
|
@ -404,7 +404,7 @@ function construct_acl_data(&$a, $user) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function acl_lookup(&$a, $out_type = 'json') {
|
function acl_lookup(App $a, $out_type = 'json') {
|
||||||
|
|
||||||
if (!local_user()) {
|
if (!local_user()) {
|
||||||
return '';
|
return '';
|
||||||
|
|
@ -691,7 +691,7 @@ function acl_lookup(&$a, $out_type = 'json') {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return array with the search results
|
* @return array with the search results
|
||||||
*/
|
*/
|
||||||
function navbar_complete(App &$a) {
|
function navbar_complete(App $a) {
|
||||||
|
|
||||||
// logger('navbar_complete');
|
// logger('navbar_complete');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -133,7 +133,7 @@
|
||||||
* @hook 'logged_in'
|
* @hook 'logged_in'
|
||||||
* array $user logged user record
|
* array $user logged user record
|
||||||
*/
|
*/
|
||||||
function api_login(App &$a){
|
function api_login(App $a){
|
||||||
// login with oauth
|
// login with oauth
|
||||||
try{
|
try{
|
||||||
$oauth = new FKOAuth1();
|
$oauth = new FKOAuth1();
|
||||||
|
|
@ -251,7 +251,7 @@
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string API call result
|
* @return string API call result
|
||||||
*/
|
*/
|
||||||
function api_call(App &$a){
|
function api_call(App $a){
|
||||||
global $API, $called_api;
|
global $API, $called_api;
|
||||||
|
|
||||||
$type="json";
|
$type="json";
|
||||||
|
|
@ -404,7 +404,7 @@
|
||||||
* @param array $user_info
|
* @param array $user_info
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function api_rss_extra(&$a, $arr, $user_info){
|
function api_rss_extra(App $a, $arr, $user_info){
|
||||||
if (is_null($user_info)) $user_info = api_get_user($a);
|
if (is_null($user_info)) $user_info = api_get_user($a);
|
||||||
$arr['$user'] = $user_info;
|
$arr['$user'] = $user_info;
|
||||||
$arr['$rss'] = array(
|
$arr['$rss'] = array(
|
||||||
|
|
@ -444,7 +444,7 @@
|
||||||
* @param int|string $contact_id Contact ID or URL
|
* @param int|string $contact_id Contact ID or URL
|
||||||
* @param string $type Return type (for errors)
|
* @param string $type Return type (for errors)
|
||||||
*/
|
*/
|
||||||
function api_get_user(&$a, $contact_id = Null, $type = "json"){
|
function api_get_user(App $a, $contact_id = Null, $type = "json"){
|
||||||
global $called_api;
|
global $called_api;
|
||||||
$user = null;
|
$user = null;
|
||||||
$extra_query = "";
|
$extra_query = "";
|
||||||
|
|
@ -712,7 +712,7 @@
|
||||||
* @param array $item : item from db
|
* @param array $item : item from db
|
||||||
* @return array(array:author, array:owner)
|
* @return array(array:author, array:owner)
|
||||||
*/
|
*/
|
||||||
function api_item_get_user(&$a, $item) {
|
function api_item_get_user(App $a, $item) {
|
||||||
|
|
||||||
$status_user = api_get_user($a, $item["author-link"]);
|
$status_user = api_get_user($a, $item["author-link"]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -466,7 +466,7 @@ function item_condition() {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(!function_exists('conversation')) {
|
if(!function_exists('conversation')) {
|
||||||
function conversation(&$a, $items, $mode, $update, $preview = false) {
|
function conversation(App $a, $items, $mode, $update, $preview = false) {
|
||||||
|
|
||||||
require_once('include/bbcode.php');
|
require_once('include/bbcode.php');
|
||||||
require_once('include/Contact.php');
|
require_once('include/Contact.php');
|
||||||
|
|
|
||||||
|
|
@ -264,8 +264,9 @@ function cron_poll_contacts($argc, $argv) {
|
||||||
intval($c['id'])
|
intval($c['id'])
|
||||||
);
|
);
|
||||||
|
|
||||||
if (dbm::is_result($res))
|
if (!dbm::is_result($res)) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
foreach($res as $contact) {
|
foreach($res as $contact) {
|
||||||
|
|
||||||
|
|
@ -343,7 +344,7 @@ function cron_poll_contacts($argc, $argv) {
|
||||||
*
|
*
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function cron_clear_cache(App &$a) {
|
function cron_clear_cache(App $a) {
|
||||||
|
|
||||||
$last = get_config('system','cache_last_cleared');
|
$last = get_config('system','cache_last_cleared');
|
||||||
|
|
||||||
|
|
@ -430,7 +431,7 @@ function cron_clear_cache(App &$a) {
|
||||||
*
|
*
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function cron_repair_diaspora(App &$a) {
|
function cron_repair_diaspora(App $a) {
|
||||||
$r = q("SELECT `id`, `url` FROM `contact`
|
$r = q("SELECT `id`, `url` FROM `contact`
|
||||||
WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
|
WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
|
||||||
ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
|
ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ require_once("include/dfrn.php");
|
||||||
function delivery_run(&$argv, &$argc){
|
function delivery_run(&$argv, &$argc){
|
||||||
global $a, $db;
|
global $a, $db;
|
||||||
|
|
||||||
if (is_null($a)){
|
if (is_null($a)) {
|
||||||
$a = new App;
|
$a = new App;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -32,8 +32,9 @@ function delivery_run(&$argv, &$argc){
|
||||||
|
|
||||||
load_hooks();
|
load_hooks();
|
||||||
|
|
||||||
if ($argc < 3)
|
if ($argc < 3) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$a->set_baseurl(get_config('system','url'));
|
$a->set_baseurl(get_config('system','url'));
|
||||||
|
|
||||||
|
|
@ -42,10 +43,11 @@ function delivery_run(&$argv, &$argc){
|
||||||
$cmd = $argv[1];
|
$cmd = $argv[1];
|
||||||
$item_id = intval($argv[2]);
|
$item_id = intval($argv[2]);
|
||||||
|
|
||||||
for($x = 3; $x < $argc; $x ++) {
|
for ($x = 3; $x < $argc; $x ++) {
|
||||||
|
|
||||||
$contact_id = intval($argv[$x]);
|
$contact_id = intval($argv[$x]);
|
||||||
|
|
||||||
|
/// @todo When switching completely to the worker we won't need this anymore
|
||||||
// Some other process may have delivered this item already.
|
// Some other process may have delivered this item already.
|
||||||
|
|
||||||
$r = q("SELECT * FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d LIMIT 1",
|
$r = q("SELECT * FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d LIMIT 1",
|
||||||
|
|
@ -57,8 +59,9 @@ function delivery_run(&$argv, &$argc){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($a->maxload_reached())
|
if ($a->maxload_reached()) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// It's ours to deliver. Remove it from the queue.
|
// It's ours to deliver. Remove it from the queue.
|
||||||
|
|
||||||
|
|
@ -68,8 +71,9 @@ function delivery_run(&$argv, &$argc){
|
||||||
dbesc($contact_id)
|
dbesc($contact_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!$item_id || !$contact_id)
|
if (!$item_id || !$contact_id) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$expire = false;
|
$expire = false;
|
||||||
$mail = false;
|
$mail = false;
|
||||||
|
|
@ -90,14 +94,13 @@ function delivery_run(&$argv, &$argc){
|
||||||
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
|
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
|
||||||
intval($item_id)
|
intval($item_id)
|
||||||
);
|
);
|
||||||
if (!count($message)){
|
if (!count($message)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$uid = $message[0]['uid'];
|
$uid = $message[0]['uid'];
|
||||||
$recipients[] = $message[0]['contact-id'];
|
$recipients[] = $message[0]['contact-id'];
|
||||||
$item = $message[0];
|
$item = $message[0];
|
||||||
}
|
} elseif ($cmd === 'expire') {
|
||||||
elseif ($cmd === 'expire') {
|
|
||||||
$normal_mode = false;
|
$normal_mode = false;
|
||||||
$expire = true;
|
$expire = true;
|
||||||
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
|
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
|
||||||
|
|
@ -106,18 +109,19 @@ function delivery_run(&$argv, &$argc){
|
||||||
);
|
);
|
||||||
$uid = $item_id;
|
$uid = $item_id;
|
||||||
$item_id = 0;
|
$item_id = 0;
|
||||||
if (!count($items))
|
if (!count($items)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
elseif ($cmd === 'suggest') {
|
} elseif ($cmd === 'suggest') {
|
||||||
$normal_mode = false;
|
$normal_mode = false;
|
||||||
$fsuggest = true;
|
$fsuggest = true;
|
||||||
|
|
||||||
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
|
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
|
||||||
intval($item_id)
|
intval($item_id)
|
||||||
);
|
);
|
||||||
if (!count($suggest))
|
if (!count($suggest)) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
$uid = $suggest[0]['uid'];
|
$uid = $suggest[0]['uid'];
|
||||||
$recipients[] = $suggest[0]['cid'];
|
$recipients[] = $suggest[0]['cid'];
|
||||||
$item = $suggest[0];
|
$item = $suggest[0];
|
||||||
|
|
@ -151,26 +155,33 @@ function delivery_run(&$argv, &$argc){
|
||||||
|
|
||||||
$icontacts = null;
|
$icontacts = null;
|
||||||
$contacts_arr = array();
|
$contacts_arr = array();
|
||||||
foreach($items as $item)
|
foreach ($items as $item) {
|
||||||
if (!in_array($item['contact-id'],$contacts_arr))
|
if (!in_array($item['contact-id'],$contacts_arr)) {
|
||||||
$contacts_arr[] = intval($item['contact-id']);
|
$contacts_arr[] = intval($item['contact-id']);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (count($contacts_arr)) {
|
if (count($contacts_arr)) {
|
||||||
$str_contacts = implode(',',$contacts_arr);
|
$str_contacts = implode(',',$contacts_arr);
|
||||||
$icontacts = q("SELECT * FROM `contact`
|
$icontacts = q("SELECT * FROM `contact`
|
||||||
WHERE `id` IN ( $str_contacts ) "
|
WHERE `id` IN ( $str_contacts ) "
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if ( !($icontacts && count($icontacts)))
|
if ( !($icontacts && count($icontacts))) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// avoid race condition with deleting entries
|
// avoid race condition with deleting entries
|
||||||
|
|
||||||
if ($items[0]['deleted']) {
|
if ($items[0]['deleted']) {
|
||||||
foreach($items as $item)
|
foreach ($items as $item) {
|
||||||
$item['deleted'] = 1;
|
$item['deleted'] = 1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
|
// When commenting too fast after delivery, a post wasn't recognized as top level post.
|
||||||
|
// The count then showed more than one entry. The additional check should help.
|
||||||
|
// The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
|
||||||
|
if ((($items[0]['id'] == $item_id) || (count($items) == 1)) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
|
||||||
logger('delivery: top level post');
|
logger('delivery: top level post');
|
||||||
$top_level = true;
|
$top_level = true;
|
||||||
}
|
}
|
||||||
|
|
@ -184,8 +195,9 @@ function delivery_run(&$argv, &$argc){
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!dbm::is_result($r))
|
if (!dbm::is_result($r)) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$owner = $r[0];
|
$owner = $r[0];
|
||||||
|
|
||||||
|
|
@ -217,9 +229,9 @@ function delivery_run(&$argv, &$argc){
|
||||||
|
|
||||||
|
|
||||||
$localhost = $a->get_hostname();
|
$localhost = $a->get_hostname();
|
||||||
if (strpos($localhost,':'))
|
if (strpos($localhost,':')) {
|
||||||
$localhost = substr($localhost,0,strpos($localhost,':'));
|
$localhost = substr($localhost,0,strpos($localhost,':'));
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
|
* Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
|
||||||
|
|
@ -254,12 +266,12 @@ function delivery_run(&$argv, &$argc){
|
||||||
intval($contact_id)
|
intval($contact_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r)) {
|
||||||
$contact = $r[0];
|
$contact = $r[0];
|
||||||
|
}
|
||||||
if ($contact['self'])
|
if ($contact['self']) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
$deliver_status = 0;
|
$deliver_status = 0;
|
||||||
|
|
||||||
logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']);
|
logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']);
|
||||||
|
|
@ -275,13 +287,14 @@ function delivery_run(&$argv, &$argc){
|
||||||
} elseif ($fsuggest) {
|
} elseif ($fsuggest) {
|
||||||
$atom = dfrn::fsuggest($item, $owner);
|
$atom = dfrn::fsuggest($item, $owner);
|
||||||
q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
|
q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
|
||||||
} elseif ($relocate)
|
} elseif ($relocate) {
|
||||||
$atom = dfrn::relocate($owner, $uid);
|
$atom = dfrn::relocate($owner, $uid);
|
||||||
elseif ($followup) {
|
} elseif ($followup) {
|
||||||
$msgitems = array();
|
$msgitems = array();
|
||||||
foreach($items as $item) { // there is only one item
|
foreach ($items as $item) { // there is only one item
|
||||||
if (!$item['parent'])
|
if (!$item['parent']) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
if ($item['id'] == $item_id) {
|
if ($item['id'] == $item_id) {
|
||||||
logger('followup: item: '. print_r($item,true), LOGGER_DATA);
|
logger('followup: item: '. print_r($item,true), LOGGER_DATA);
|
||||||
$msgitems[] = $item;
|
$msgitems[] = $item;
|
||||||
|
|
@ -290,17 +303,20 @@ function delivery_run(&$argv, &$argc){
|
||||||
$atom = dfrn::entries($msgitems,$owner);
|
$atom = dfrn::entries($msgitems,$owner);
|
||||||
} else {
|
} else {
|
||||||
$msgitems = array();
|
$msgitems = array();
|
||||||
foreach($items as $item) {
|
foreach ($items as $item) {
|
||||||
if (!$item['parent'])
|
if (!$item['parent']) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// private emails may be in included in public conversations. Filter them.
|
// private emails may be in included in public conversations. Filter them.
|
||||||
if ($public_message && $item['private'])
|
if ($public_message && $item['private']) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$item_contact = get_item_contact($item,$icontacts);
|
$item_contact = get_item_contact($item,$icontacts);
|
||||||
if (!$item_contact)
|
if (!$item_contact) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if ($normal_mode) {
|
if ($normal_mode) {
|
||||||
if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
|
if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
|
||||||
|
|
@ -326,10 +342,11 @@ function delivery_run(&$argv, &$argc){
|
||||||
if (link_compare($basepath,App::get_baseurl())) {
|
if (link_compare($basepath,App::get_baseurl())) {
|
||||||
|
|
||||||
$nickname = basename($contact['url']);
|
$nickname = basename($contact['url']);
|
||||||
if ($contact['issued-id'])
|
if ($contact['issued-id']) {
|
||||||
$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
|
$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
|
||||||
else
|
} else {
|
||||||
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
|
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
|
||||||
|
}
|
||||||
|
|
||||||
$x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
|
$x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
|
||||||
`contact`.`pubkey` AS `cpubkey`,
|
`contact`.`pubkey` AS `cpubkey`,
|
||||||
|
|
@ -362,19 +379,20 @@ function delivery_run(&$argv, &$argc){
|
||||||
|
|
||||||
// If we are setup as a soapbox we aren't accepting top level posts from this person
|
// If we are setup as a soapbox we aren't accepting top level posts from this person
|
||||||
|
|
||||||
if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
|
if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
logger('mod-delivery: local delivery');
|
logger('mod-delivery: local delivery');
|
||||||
dfrn::import($atom, $x[0]);
|
dfrn::import($atom, $x[0]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!was_recently_delayed($contact['id']))
|
if (!was_recently_delayed($contact['id'])) {
|
||||||
$deliver_status = dfrn::deliver($owner,$contact,$atom);
|
$deliver_status = dfrn::deliver($owner,$contact,$atom);
|
||||||
else
|
} else {
|
||||||
$deliver_status = (-1);
|
$deliver_status = (-1);
|
||||||
|
}
|
||||||
|
|
||||||
logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
|
logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
|
||||||
|
|
||||||
|
|
@ -393,10 +411,12 @@ function delivery_run(&$argv, &$argc){
|
||||||
|
|
||||||
case NETWORK_OSTATUS:
|
case NETWORK_OSTATUS:
|
||||||
// Do not send to otatus if we are not configured to send to public networks
|
// Do not send to otatus if we are not configured to send to public networks
|
||||||
if ($owner['prvnets'])
|
if ($owner['prvnets']) {
|
||||||
break;
|
break;
|
||||||
if (get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
|
}
|
||||||
|
if (get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// There is currently no code here to distribute anything to OStatus.
|
// There is currently no code here to distribute anything to OStatus.
|
||||||
// This is done in "notifier.php" (See "url_recipients" and "push_notify")
|
// This is done in "notifier.php" (See "url_recipients" and "push_notify")
|
||||||
|
|
@ -405,20 +425,22 @@ function delivery_run(&$argv, &$argc){
|
||||||
case NETWORK_MAIL:
|
case NETWORK_MAIL:
|
||||||
case NETWORK_MAIL2:
|
case NETWORK_MAIL2:
|
||||||
|
|
||||||
if (get_config('system','dfrn_only'))
|
if (get_config('system','dfrn_only')) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
// WARNING: does not currently convert to RFC2047 header encodings, etc.
|
// WARNING: does not currently convert to RFC2047 header encodings, etc.
|
||||||
|
|
||||||
$addr = $contact['addr'];
|
$addr = $contact['addr'];
|
||||||
if (!strlen($addr))
|
if (!strlen($addr)) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if ($cmd === 'wall-new' || $cmd === 'comment-new') {
|
if ($cmd === 'wall-new' || $cmd === 'comment-new') {
|
||||||
|
|
||||||
$it = null;
|
$it = null;
|
||||||
if ($cmd === 'wall-new')
|
if ($cmd === 'wall-new') {
|
||||||
$it = $items[0];
|
$it = $items[0];
|
||||||
else {
|
} else {
|
||||||
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
intval($argv[2]),
|
intval($argv[2]),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
|
|
@ -451,10 +473,12 @@ function delivery_run(&$argv, &$argc){
|
||||||
if ($reply_to) {
|
if ($reply_to) {
|
||||||
$headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
|
$headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
|
||||||
$headers .= 'Sender: '.$local_user[0]['email']."\n";
|
$headers .= 'Sender: '.$local_user[0]['email']."\n";
|
||||||
} else
|
} else {
|
||||||
$headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
|
$headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
|
||||||
} else
|
}
|
||||||
|
} else {
|
||||||
$headers = 'From: '. email_header_encode($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
|
$headers = 'From: '. email_header_encode($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
|
||||||
|
}
|
||||||
|
|
||||||
//if ($reply_to)
|
//if ($reply_to)
|
||||||
// $headers .= 'Reply-to: '.$reply_to . "\n";
|
// $headers .= 'Reply-to: '.$reply_to . "\n";
|
||||||
|
|
@ -478,9 +502,9 @@ function delivery_run(&$argv, &$argc){
|
||||||
dbesc($it['parent-uri']),
|
dbesc($it['parent-uri']),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (dbm::is_result($r) AND ($r[0]['title'] != ''))
|
if (dbm::is_result($r) AND ($r[0]['title'] != '')) {
|
||||||
$subject = $r[0]['title'];
|
$subject = $r[0]['title'];
|
||||||
else {
|
} else {
|
||||||
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($it['parent-uri']),
|
dbesc($it['parent-uri']),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
|
||||||
|
|
@ -325,8 +325,9 @@ class Diaspora {
|
||||||
logger("delivering to: ".$rr["username"]);
|
logger("delivering to: ".$rr["username"]);
|
||||||
self::dispatch($rr,$msg);
|
self::dispatch($rr,$msg);
|
||||||
}
|
}
|
||||||
} else
|
} else {
|
||||||
logger("No subscribers for ".$msg["author"]." ".print_r($msg, true));
|
logger("No subscribers for ".$msg["author"]." ".print_r($msg, true), LOGGER_DEBUG);
|
||||||
|
}
|
||||||
|
|
||||||
return $message_id;
|
return $message_id;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -206,7 +206,7 @@ function bbtoevent($s) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function sort_by_date(App &$a) {
|
function sort_by_date(App $a) {
|
||||||
|
|
||||||
usort($a,'ev_compare');
|
usort($a,'ev_compare');
|
||||||
return $a;
|
return $a;
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ require_once("mod/proxy.php");
|
||||||
* @param int $profile
|
* @param int $profile
|
||||||
* @param array $profiledata
|
* @param array $profiledata
|
||||||
*/
|
*/
|
||||||
function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
|
function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
|
||||||
|
|
||||||
$user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
|
$user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
|
||||||
dbesc($nickname)
|
dbesc($nickname)
|
||||||
|
|
@ -598,7 +598,7 @@ function get_events() {
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
function advanced_profile(App &$a) {
|
function advanced_profile(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
$uid = $a->profile['uid'];
|
$uid = $a->profile['uid'];
|
||||||
|
|
@ -755,7 +755,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
array(
|
array(
|
||||||
'label'=>t('Status'),
|
'label'=>t('Status'),
|
||||||
'url' => $url,
|
'url' => $url,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
|
'sel' => ((!isset($tab) && $a->argv[0]=='profile')?'active':''),
|
||||||
'title' => t('Status Messages and Posts'),
|
'title' => t('Status Messages and Posts'),
|
||||||
'id' => 'status-tab',
|
'id' => 'status-tab',
|
||||||
'accesskey' => 'm',
|
'accesskey' => 'm',
|
||||||
|
|
@ -771,7 +771,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
array(
|
array(
|
||||||
'label' => t('Photos'),
|
'label' => t('Photos'),
|
||||||
'url' => App::get_baseurl() . '/photos/' . $nickname,
|
'url' => App::get_baseurl() . '/photos/' . $nickname,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
|
'sel' => ((!isset($tab) && $a->argv[0]=='photos')?'active':''),
|
||||||
'title' => t('Photo Albums'),
|
'title' => t('Photo Albums'),
|
||||||
'id' => 'photo-tab',
|
'id' => 'photo-tab',
|
||||||
'accesskey' => 'h',
|
'accesskey' => 'h',
|
||||||
|
|
@ -779,7 +779,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
array(
|
array(
|
||||||
'label' => t('Videos'),
|
'label' => t('Videos'),
|
||||||
'url' => App::get_baseurl() . '/videos/' . $nickname,
|
'url' => App::get_baseurl() . '/videos/' . $nickname,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
|
'sel' => ((!isset($tab) && $a->argv[0]=='videos')?'active':''),
|
||||||
'title' => t('Videos'),
|
'title' => t('Videos'),
|
||||||
'id' => 'video-tab',
|
'id' => 'video-tab',
|
||||||
'accesskey' => 'v',
|
'accesskey' => 'v',
|
||||||
|
|
@ -791,7 +791,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => t('Events'),
|
'label' => t('Events'),
|
||||||
'url' => App::get_baseurl() . '/events',
|
'url' => App::get_baseurl() . '/events',
|
||||||
'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
|
'sel' =>((!isset($tab) && $a->argv[0]=='events')?'active':''),
|
||||||
'title' => t('Events and Calendar'),
|
'title' => t('Events and Calendar'),
|
||||||
'id' => 'events-tab',
|
'id' => 'events-tab',
|
||||||
'accesskey' => 'e',
|
'accesskey' => 'e',
|
||||||
|
|
@ -802,7 +802,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => t('Events'),
|
'label' => t('Events'),
|
||||||
'url' => App::get_baseurl() . '/cal/' . $nickname,
|
'url' => App::get_baseurl() . '/cal/' . $nickname,
|
||||||
'sel' =>((!isset($tab)&&$a->argv[0]=='cal')?'active':''),
|
'sel' =>((!isset($tab) && $a->argv[0]=='cal')?'active':''),
|
||||||
'title' => t('Events and Calendar'),
|
'title' => t('Events and Calendar'),
|
||||||
'id' => 'events-tab',
|
'id' => 'events-tab',
|
||||||
'accesskey' => 'e',
|
'accesskey' => 'e',
|
||||||
|
|
@ -813,7 +813,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => t('Personal Notes'),
|
'label' => t('Personal Notes'),
|
||||||
'url' => App::get_baseurl() . '/notes',
|
'url' => App::get_baseurl() . '/notes',
|
||||||
'sel' =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
|
'sel' =>((!isset($tab) && $a->argv[0]=='notes')?'active':''),
|
||||||
'title' => t('Only You Can See This'),
|
'title' => t('Only You Can See This'),
|
||||||
'id' => 'notes-tab',
|
'id' => 'notes-tab',
|
||||||
'accesskey' => 't',
|
'accesskey' => 't',
|
||||||
|
|
@ -824,7 +824,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => t('Contacts'),
|
'label' => t('Contacts'),
|
||||||
'url' => App::get_baseurl() . '/viewcontacts/' . $nickname,
|
'url' => App::get_baseurl() . '/viewcontacts/' . $nickname,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
|
'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts')?'active':''),
|
||||||
'title' => t('Contacts'),
|
'title' => t('Contacts'),
|
||||||
'id' => 'viewcontacts-tab',
|
'id' => 'viewcontacts-tab',
|
||||||
'accesskey' => 'k',
|
'accesskey' => 'k',
|
||||||
|
|
@ -845,7 +845,7 @@ function get_my_url() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function zrl_init(App &$a) {
|
function zrl_init(App $a) {
|
||||||
$tmp_str = get_my_url();
|
$tmp_str = get_my_url();
|
||||||
if(validate_url($tmp_str)) {
|
if(validate_url($tmp_str)) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function nav(App &$a) {
|
function nav(App $a) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use \Friendica\Core\Config;
|
use \Friendica\Core\Config;
|
||||||
use \Friendica\Core\PConfig;
|
|
||||||
|
|
||||||
require_once("include/xml.php");
|
require_once("include/xml.php");
|
||||||
require_once('include/Probe.php');
|
require_once('include/Probe.php');
|
||||||
|
|
|
||||||
|
|
@ -43,11 +43,11 @@ require_once('include/salmon.php');
|
||||||
function notifier_run(&$argv, &$argc){
|
function notifier_run(&$argv, &$argc){
|
||||||
global $a, $db;
|
global $a, $db;
|
||||||
|
|
||||||
if(is_null($a)){
|
if (is_null($a)) {
|
||||||
$a = new App;
|
$a = new App;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_null($db)) {
|
if (is_null($db)) {
|
||||||
@include(".htconfig.php");
|
@include(".htconfig.php");
|
||||||
require_once("include/dba.php");
|
require_once("include/dba.php");
|
||||||
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||||
|
|
@ -64,8 +64,9 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
load_hooks();
|
load_hooks();
|
||||||
|
|
||||||
if($argc < 3)
|
if ($argc < 3) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$a->set_baseurl(get_config('system','url'));
|
$a->set_baseurl(get_config('system','url'));
|
||||||
|
|
||||||
|
|
@ -77,7 +78,7 @@ function notifier_run(&$argv, &$argc){
|
||||||
case 'mail':
|
case 'mail':
|
||||||
default:
|
default:
|
||||||
$item_id = intval($argv[2]);
|
$item_id = intval($argv[2]);
|
||||||
if(! $item_id){
|
if (! $item_id) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -93,21 +94,20 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
$normal_mode = true;
|
$normal_mode = true;
|
||||||
|
|
||||||
if($cmd === 'mail') {
|
if ($cmd === 'mail') {
|
||||||
$normal_mode = false;
|
$normal_mode = false;
|
||||||
$mail = true;
|
$mail = true;
|
||||||
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
|
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
|
||||||
intval($item_id)
|
intval($item_id)
|
||||||
);
|
);
|
||||||
if(! count($message)){
|
if (! count($message)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$uid = $message[0]['uid'];
|
$uid = $message[0]['uid'];
|
||||||
$recipients[] = $message[0]['contact-id'];
|
$recipients[] = $message[0]['contact-id'];
|
||||||
$item = $message[0];
|
$item = $message[0];
|
||||||
|
|
||||||
}
|
} elseif ($cmd === 'expire') {
|
||||||
elseif($cmd === 'expire') {
|
|
||||||
$normal_mode = false;
|
$normal_mode = false;
|
||||||
$expire = true;
|
$expire = true;
|
||||||
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
|
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
|
||||||
|
|
@ -116,22 +116,23 @@ function notifier_run(&$argv, &$argc){
|
||||||
);
|
);
|
||||||
$uid = $item_id;
|
$uid = $item_id;
|
||||||
$item_id = 0;
|
$item_id = 0;
|
||||||
if(! count($items))
|
if (! count($items)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
elseif($cmd === 'suggest') {
|
} elseif ($cmd === 'suggest') {
|
||||||
$normal_mode = false;
|
$normal_mode = false;
|
||||||
$fsuggest = true;
|
$fsuggest = true;
|
||||||
|
|
||||||
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
|
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
|
||||||
intval($item_id)
|
intval($item_id)
|
||||||
);
|
);
|
||||||
if(! count($suggest))
|
if (! count($suggest)) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
$uid = $suggest[0]['uid'];
|
$uid = $suggest[0]['uid'];
|
||||||
$recipients[] = $suggest[0]['cid'];
|
$recipients[] = $suggest[0]['cid'];
|
||||||
$item = $suggest[0];
|
$item = $suggest[0];
|
||||||
} elseif($cmd === 'removeme') {
|
} elseif ($cmd === 'removeme') {
|
||||||
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
|
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
|
||||||
`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
|
`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
|
||||||
`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
|
`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
|
||||||
|
|
@ -150,15 +151,15 @@ function notifier_run(&$argv, &$argc){
|
||||||
$self = $r[0];
|
$self = $r[0];
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
|
$r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
|
||||||
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);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} elseif($cmd === 'relocate') {
|
} elseif ($cmd === 'relocate') {
|
||||||
$normal_mode = false;
|
$normal_mode = false;
|
||||||
$relocate = true;
|
$relocate = true;
|
||||||
$uid = $item_id;
|
$uid = $item_id;
|
||||||
|
|
@ -170,7 +171,7 @@ function notifier_run(&$argv, &$argc){
|
||||||
intval($item_id)
|
intval($item_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
|
if ((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -184,18 +185,19 @@ function notifier_run(&$argv, &$argc){
|
||||||
intval($parent_id)
|
intval($parent_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if(! count($items)) {
|
if (! count($items)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// avoid race condition with deleting entries
|
// avoid race condition with deleting entries
|
||||||
|
|
||||||
if($items[0]['deleted']) {
|
if ($items[0]['deleted']) {
|
||||||
foreach($items as $item)
|
foreach ($items as $item) {
|
||||||
$item['deleted'] = 1;
|
$item['deleted'] = 1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
|
if ((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
|
||||||
logger('notifier: top level post');
|
logger('notifier: top level post');
|
||||||
$top_level = true;
|
$top_level = true;
|
||||||
}
|
}
|
||||||
|
|
@ -220,6 +222,9 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
$hub = get_config('system','huburl');
|
$hub = get_config('system','huburl');
|
||||||
|
|
||||||
|
// Should the post be transmitted to Diaspora?
|
||||||
|
$diaspora_delivery = true;
|
||||||
|
|
||||||
// If this is a public conversation, notify the feed hub
|
// If this is a public conversation, notify the feed hub
|
||||||
$public_message = true;
|
$public_message = true;
|
||||||
|
|
||||||
|
|
@ -229,7 +234,7 @@ function notifier_run(&$argv, &$argc){
|
||||||
// fill this in with a single salmon slap if applicable
|
// fill this in with a single salmon slap if applicable
|
||||||
$slap = '';
|
$slap = '';
|
||||||
|
|
||||||
if(! ($mail || $fsuggest || $relocate)) {
|
if (! ($mail || $fsuggest || $relocate)) {
|
||||||
|
|
||||||
$slap = ostatus::salmon($target_item,$owner);
|
$slap = ostatus::salmon($target_item,$owner);
|
||||||
|
|
||||||
|
|
@ -240,7 +245,7 @@ function notifier_run(&$argv, &$argc){
|
||||||
$thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
|
$thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
|
||||||
dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
|
dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
|
||||||
|
|
||||||
logger('Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
|
logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
|
||||||
|
|
||||||
// This is IMPORTANT!!!!
|
// This is IMPORTANT!!!!
|
||||||
|
|
||||||
|
|
@ -264,9 +269,9 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
|
|
||||||
$localhost = str_replace('www.','',$a->get_hostname());
|
$localhost = str_replace('www.','',$a->get_hostname());
|
||||||
if(strpos($localhost,':'))
|
if (strpos($localhost,':')) {
|
||||||
$localhost = substr($localhost,0,strpos($localhost,':'));
|
$localhost = substr($localhost,0,strpos($localhost,':'));
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Be VERY CAREFUL if you make any changes to the following several lines. Seemingly innocuous changes
|
* Be VERY CAREFUL if you make any changes to the following several lines. Seemingly innocuous changes
|
||||||
|
|
@ -277,12 +282,12 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
$relay_to_owner = false;
|
$relay_to_owner = false;
|
||||||
|
|
||||||
if(!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
|
if (!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
|
||||||
$relay_to_owner = true;
|
$relay_to_owner = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) {
|
if (($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) {
|
||||||
$relay_to_owner = true;
|
$relay_to_owner = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -290,13 +295,13 @@ function notifier_run(&$argv, &$argc){
|
||||||
// we will just use it as a fallback test
|
// we will just use it as a fallback test
|
||||||
// later we will be able to use it as the primary test of whether or not to relay.
|
// later we will be able to use it as the primary test of whether or not to relay.
|
||||||
|
|
||||||
if(! $target_item['origin'])
|
if (! $target_item['origin']) {
|
||||||
$relay_to_owner = false;
|
$relay_to_owner = false;
|
||||||
|
}
|
||||||
if($parent['origin'])
|
if ($parent['origin']) {
|
||||||
$relay_to_owner = false;
|
$relay_to_owner = false;
|
||||||
|
}
|
||||||
if($relay_to_owner) {
|
if ($relay_to_owner) {
|
||||||
logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
|
logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
|
||||||
// local followup to remote post
|
// local followup to remote post
|
||||||
$followup = true;
|
$followup = true;
|
||||||
|
|
@ -322,11 +327,13 @@ function notifier_run(&$argv, &$argc){
|
||||||
intval($uid),
|
intval($uid),
|
||||||
dbesc(NETWORK_DFRN)
|
dbesc(NETWORK_DFRN)
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r)) {
|
||||||
foreach($r as $rr)
|
foreach ($r as $rr) {
|
||||||
$recipients_followup[] = $rr['id'];
|
$recipients_followup[] = $rr['id'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
|
logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
|
||||||
} else {
|
} else {
|
||||||
$followup = false;
|
$followup = false;
|
||||||
|
|
@ -335,12 +342,12 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
// don't send deletions onward for other people's stuff
|
// don't send deletions onward for other people's stuff
|
||||||
|
|
||||||
if($target_item['deleted'] && (! intval($target_item['wall']))) {
|
if ($target_item['deleted'] && (! intval($target_item['wall']))) {
|
||||||
logger('notifier: ignoring delete notification for non-wall item');
|
logger('notifier: ignoring delete notification for non-wall item');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if((strlen($parent['allow_cid']))
|
if ((strlen($parent['allow_cid']))
|
||||||
|| (strlen($parent['allow_gid']))
|
|| (strlen($parent['allow_gid']))
|
||||||
|| (strlen($parent['deny_cid']))
|
|| (strlen($parent['deny_cid']))
|
||||||
|| (strlen($parent['deny_gid']))) {
|
|| (strlen($parent['deny_gid']))) {
|
||||||
|
|
@ -355,24 +362,23 @@ function notifier_run(&$argv, &$argc){
|
||||||
// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
|
// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
|
||||||
// a delivery fork. private groups (forum_mode == 2) do not uplink
|
// a delivery fork. private groups (forum_mode == 2) do not uplink
|
||||||
|
|
||||||
if((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
|
if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
|
||||||
proc_run(PRIORITY_HIGH,'include/notifier.php','uplink',$item_id);
|
proc_run(PRIORITY_HIGH,'include/notifier.php','uplink',$item_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
$conversants = array();
|
$conversants = array();
|
||||||
|
|
||||||
foreach($items as $item) {
|
foreach ($items as $item) {
|
||||||
$recipients[] = $item['contact-id'];
|
$recipients[] = $item['contact-id'];
|
||||||
$conversants[] = $item['contact-id'];
|
$conversants[] = $item['contact-id'];
|
||||||
// pull out additional tagged people to notify (if public message)
|
// pull out additional tagged people to notify (if public message)
|
||||||
if($public_message && strlen($item['inform'])) {
|
if ($public_message && strlen($item['inform'])) {
|
||||||
$people = explode(',',$item['inform']);
|
$people = explode(',',$item['inform']);
|
||||||
foreach($people as $person) {
|
foreach ($people as $person) {
|
||||||
if(substr($person,0,4) === 'cid:') {
|
if (substr($person,0,4) === 'cid:') {
|
||||||
$recipients[] = intval(substr($person,4));
|
$recipients[] = intval(substr($person,4));
|
||||||
$conversants[] = intval(substr($person,4));
|
$conversants[] = intval(substr($person,4));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$url_recipients[] = substr($person,4);
|
$url_recipients[] = substr($person,4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -396,16 +402,19 @@ function notifier_run(&$argv, &$argc){
|
||||||
// We have not only to look at the parent, since it could be a Friendica thread.
|
// We have not only to look at the parent, since it could be a Friendica thread.
|
||||||
if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
|
if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
|
||||||
|
|
||||||
|
$diaspora_delivery = false;
|
||||||
|
|
||||||
logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG);
|
logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG);
|
||||||
|
|
||||||
// Send a salmon to the parent author
|
// Send a salmon to the parent author
|
||||||
$r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
|
$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
|
||||||
dbesc(normalise_link($thr_parent[0]['author-link'])),
|
dbesc(normalise_link($thr_parent[0]['author-link'])),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
if ($r)
|
if (dbm::is_result($r)) {
|
||||||
$probed_contact = $r[0];
|
$probed_contact = $r[0];
|
||||||
else
|
} else {
|
||||||
$probed_contact = probe_url($thr_parent[0]['author-link']);
|
$probed_contact = probe_url($thr_parent[0]['author-link']);
|
||||||
|
}
|
||||||
|
|
||||||
if ($probed_contact["notify"] != "") {
|
if ($probed_contact["notify"] != "") {
|
||||||
logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
|
logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
|
||||||
|
|
@ -413,13 +422,15 @@ function notifier_run(&$argv, &$argc){
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send a salmon to the parent owner
|
// Send a salmon to the parent owner
|
||||||
$r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
|
$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
|
||||||
dbesc(normalise_link($thr_parent[0]['owner-link'])),
|
dbesc(normalise_link($thr_parent[0]['owner-link'])),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
if ($r)
|
if (dbm::is_result($r)) {
|
||||||
$probed_contact = $r[0];
|
$probed_contact = $r[0];
|
||||||
else
|
} else {
|
||||||
$probed_contact = probe_url($thr_parent[0]['owner-link']);
|
$probed_contact = probe_url($thr_parent[0]['owner-link']);
|
||||||
|
}
|
||||||
|
|
||||||
if ($probed_contact["notify"] != "") {
|
if ($probed_contact["notify"] != "") {
|
||||||
logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
|
logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
|
||||||
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
|
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
|
||||||
|
|
@ -427,10 +438,10 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
// Send a salmon notification to every person we mentioned in the post
|
// Send a salmon notification to every person we mentioned in the post
|
||||||
$arr = explode(',',$target_item['tag']);
|
$arr = explode(',',$target_item['tag']);
|
||||||
foreach($arr as $x) {
|
foreach ($arr as $x) {
|
||||||
//logger('Checking tag '.$x, LOGGER_DEBUG);
|
//logger('Checking tag '.$x, LOGGER_DEBUG);
|
||||||
$matches = null;
|
$matches = null;
|
||||||
if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
|
if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
|
||||||
$probed_contact = probe_url($matches[1]);
|
$probed_contact = probe_url($matches[1]);
|
||||||
if ($probed_contact["notify"] != "") {
|
if ($probed_contact["notify"] != "") {
|
||||||
logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
|
logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
|
||||||
|
|
@ -441,23 +452,19 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
|
// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
|
||||||
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
|
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
|
||||||
} else
|
} else {
|
||||||
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')";
|
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')";
|
||||||
|
}
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
|
} else {
|
||||||
|
|
||||||
if (dbm::is_result($r))
|
|
||||||
$contacts = $r;
|
|
||||||
|
|
||||||
} else
|
|
||||||
$public_message = false;
|
$public_message = false;
|
||||||
|
}
|
||||||
|
|
||||||
// If this is a public message and pubmail is set on the parent, include all your email contacts
|
// If this is a public message and pubmail is set on the parent, include all your email contacts
|
||||||
|
|
||||||
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
|
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
|
||||||
|
|
||||||
if(! $mail_disabled) {
|
if (! $mail_disabled) {
|
||||||
if((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
|
if ((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
|
||||||
&& (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid']))
|
&& (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid']))
|
||||||
&& (intval($target_item['pubmail']))) {
|
&& (intval($target_item['pubmail']))) {
|
||||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
|
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
|
||||||
|
|
@ -465,39 +472,40 @@ function notifier_run(&$argv, &$argc){
|
||||||
dbesc(NETWORK_MAIL)
|
dbesc(NETWORK_MAIL)
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
foreach($r as $rr)
|
foreach ($r as $rr) {
|
||||||
$recipients[] = $rr['id'];
|
$recipients[] = $rr['id'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if($followup)
|
if ($followup) {
|
||||||
$recip_str = implode(', ', $recipients_followup);
|
$recip_str = implode(', ', $recipients_followup);
|
||||||
else
|
} else {
|
||||||
$recip_str = implode(', ', $recipients);
|
$recip_str = implode(', ', $recipients);
|
||||||
|
}
|
||||||
if ($relocate)
|
if ($relocate) {
|
||||||
$r = $recipients_relocate;
|
$r = $recipients_relocate;
|
||||||
else
|
} else {
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
|
$r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra,
|
||||||
dbesc($recip_str)
|
dbesc($recip_str)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
|
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
|
||||||
|
|
||||||
// If we are using the worker we don't need a delivery interval
|
// If we are using the worker we don't need a delivery interval
|
||||||
if (get_config("system", "worker"))
|
if (get_config("system", "worker")) {
|
||||||
$interval = false;
|
$interval = false;
|
||||||
|
}
|
||||||
// delivery loop
|
// delivery loop
|
||||||
|
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
|
foreach ($r as $contact) {
|
||||||
foreach($r as $contact) {
|
if (!$contact['self']) {
|
||||||
if(!$contact['self']) {
|
if (($contact['network'] === NETWORK_DIASPORA) && ($public_message)) {
|
||||||
if(($contact['network'] === NETWORK_DIASPORA) && ($public_message))
|
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)",
|
q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)",
|
||||||
dbesc($cmd),
|
dbesc($cmd),
|
||||||
intval($item_id),
|
intval($item_id),
|
||||||
|
|
@ -520,17 +528,18 @@ function notifier_run(&$argv, &$argc){
|
||||||
// When using the workerqueue, we don't need this functionality.
|
// When using the workerqueue, we don't need this functionality.
|
||||||
|
|
||||||
$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
|
$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
|
||||||
if (($deliveries_per_process <= 0) OR get_config("system", "worker"))
|
if (($deliveries_per_process <= 0) OR get_config("system", "worker")) {
|
||||||
$deliveries_per_process = 1;
|
$deliveries_per_process = 1;
|
||||||
|
}
|
||||||
|
|
||||||
$this_batch = array();
|
$this_batch = array();
|
||||||
|
|
||||||
for($x = 0; $x < count($r); $x ++) {
|
for ($x = 0; $x < count($r); $x ++) {
|
||||||
$contact = $r[$x];
|
$contact = $r[$x];
|
||||||
|
|
||||||
if($contact['self'])
|
if ($contact['self']) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
|
logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
|
||||||
|
|
||||||
// potentially more than one recipient. Start a new process and space them out a bit.
|
// potentially more than one recipient. Start a new process and space them out a bit.
|
||||||
|
|
@ -538,26 +547,28 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
$this_batch[] = $contact['id'];
|
$this_batch[] = $contact['id'];
|
||||||
|
|
||||||
if(count($this_batch) >= $deliveries_per_process) {
|
if (count($this_batch) >= $deliveries_per_process) {
|
||||||
proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
|
proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
|
||||||
$this_batch = array();
|
$this_batch = array();
|
||||||
if($interval)
|
if ($interval) {
|
||||||
@time_sleep_until(microtime(true) + (float) $interval);
|
@time_sleep_until(microtime(true) + (float) $interval);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// be sure to pick up any stragglers
|
// be sure to pick up any stragglers
|
||||||
if(count($this_batch))
|
if (count($this_batch)) {
|
||||||
proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
|
proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
|
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
|
||||||
// They are especially used for notifications to OStatus users that don't follow us.
|
// They are especially used for notifications to OStatus users that don't follow us.
|
||||||
|
|
||||||
if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
|
if ($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
|
||||||
if(!get_config('system','dfrn_only')) {
|
if (!get_config('system','dfrn_only')) {
|
||||||
foreach($url_recipients as $url) {
|
foreach ($url_recipients as $url) {
|
||||||
if ($url) {
|
if ($url) {
|
||||||
logger('notifier: urldelivery: ' . $url);
|
logger('notifier: urldelivery: ' . $url);
|
||||||
$deliver_status = slapper($owner,$url,$slap);
|
$deliver_status = slapper($owner,$url,$slap);
|
||||||
|
|
@ -568,12 +579,15 @@ function notifier_run(&$argv, &$argc){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if($public_message) {
|
if ($public_message) {
|
||||||
|
|
||||||
if (!$followup)
|
|
||||||
$r0 = Diaspora::relay_list();
|
|
||||||
else
|
|
||||||
$r0 = array();
|
$r0 = array();
|
||||||
|
$r1 = array();
|
||||||
|
|
||||||
|
if ($diaspora_delivery) {
|
||||||
|
if (!$followup) {
|
||||||
|
$r0 = Diaspora::relay_list();
|
||||||
|
}
|
||||||
|
|
||||||
$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
|
$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
|
||||||
AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
|
AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
|
||||||
|
|
@ -581,6 +595,7 @@ function notifier_run(&$argv, &$argc){
|
||||||
intval($owner['uid']),
|
intval($owner['uid']),
|
||||||
intval(CONTACT_IS_SHARING)
|
intval(CONTACT_IS_SHARING)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$r2 = q("SELECT `id`, `name`,`network` FROM `contact`
|
$r2 = q("SELECT `id`, `name`,`network` FROM `contact`
|
||||||
WHERE `network` in ( '%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive`
|
WHERE `network` in ( '%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive`
|
||||||
|
|
@ -599,7 +614,7 @@ function notifier_run(&$argv, &$argc){
|
||||||
// throw everything into the queue in case we get killed
|
// throw everything into the queue in case we get killed
|
||||||
|
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
if((! $mail) && (! $fsuggest) && (! $followup)) {
|
if ((! $mail) && (! $fsuggest) && (! $followup)) {
|
||||||
q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)
|
q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)
|
||||||
ON DUPLICATE KEY UPDATE `cmd` = '%s', `item` = %d, `contact` = %d",
|
ON DUPLICATE KEY UPDATE `cmd` = '%s', `item` = %d, `contact` = %d",
|
||||||
dbesc($cmd), intval($item_id), intval($rr['id']),
|
dbesc($cmd), intval($item_id), intval($rr['id']),
|
||||||
|
|
@ -613,32 +628,34 @@ function notifier_run(&$argv, &$argc){
|
||||||
// except for Diaspora batch jobs
|
// except for Diaspora batch jobs
|
||||||
// Don't deliver to folks who have already been delivered to
|
// Don't deliver to folks who have already been delivered to
|
||||||
|
|
||||||
if(($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'],$conversants))) {
|
if (($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'],$conversants))) {
|
||||||
logger('notifier: already delivered id=' . $rr['id']);
|
logger('notifier: already delivered id=' . $rr['id']);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if((! $mail) && (! $fsuggest) && (! $followup)) {
|
if ((! $mail) && (! $fsuggest) && (! $followup)) {
|
||||||
logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
|
logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
|
||||||
proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$rr['id']);
|
proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$rr['id']);
|
||||||
if($interval)
|
if ($interval) {
|
||||||
@time_sleep_until(microtime(true) + (float) $interval);
|
@time_sleep_until(microtime(true) + (float) $interval);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$push_notify = true;
|
$push_notify = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
|
// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
|
||||||
if($push_notify AND strlen($hub)) {
|
if ($push_notify AND strlen($hub)) {
|
||||||
$hubs = explode(',', $hub);
|
$hubs = explode(',', $hub);
|
||||||
if(count($hubs)) {
|
if (count($hubs)) {
|
||||||
foreach($hubs as $h) {
|
foreach ($hubs as $h) {
|
||||||
$h = trim($h);
|
$h = trim($h);
|
||||||
if(! strlen($h))
|
if (! strlen($h)) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if ($h === '[internal]') {
|
if ($h === '[internal]') {
|
||||||
// Set push flag for PuSH subscribers to this topic,
|
// Set push flag for PuSH subscribers to this topic,
|
||||||
|
|
@ -654,10 +671,11 @@ function notifier_run(&$argv, &$argc){
|
||||||
post_url($h,$params);
|
post_url($h,$params);
|
||||||
logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
|
logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
|
||||||
}
|
}
|
||||||
if(count($hubs) > 1)
|
if (count($hubs) > 1) {
|
||||||
sleep(7); // try and avoid multiple hubs responding at precisely the same time
|
sleep(7); // try and avoid multiple hubs responding at precisely the same time
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Handling the pubsubhubbub requests
|
// Handling the pubsubhubbub requests
|
||||||
proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
|
proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
|
||||||
|
|
@ -665,8 +683,9 @@ function notifier_run(&$argv, &$argc){
|
||||||
|
|
||||||
logger('notifier: calling hooks', LOGGER_DEBUG);
|
logger('notifier: calling hooks', LOGGER_DEBUG);
|
||||||
|
|
||||||
if($normal_mode)
|
if ($normal_mode) {
|
||||||
call_hooks('notifier_normal',$target_item);
|
call_hooks('notifier_normal',$target_item);
|
||||||
|
}
|
||||||
|
|
||||||
call_hooks('notifier_end',$target_item);
|
call_hooks('notifier_end',$target_item);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2072,7 +2072,7 @@ class ostatus {
|
||||||
*
|
*
|
||||||
* @return string XML feed
|
* @return string XML feed
|
||||||
*/
|
*/
|
||||||
public static function feed(&$a, $owner_nick, $last_update) {
|
public static function feed(App $a, $owner_nick, $last_update) {
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
|
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
|
||||||
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
|
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
|
||||||
|
|
|
||||||
|
|
@ -296,7 +296,7 @@ function shortenmsg($msg, $limit, $twitter = false) {
|
||||||
*
|
*
|
||||||
* @return string The converted message
|
* @return string The converted message
|
||||||
*/
|
*/
|
||||||
function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
|
function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
|
||||||
|
|
||||||
// Remove the hash tags
|
// Remove the hash tags
|
||||||
$URLSearchString = "^\[\]";
|
$URLSearchString = "^\[\]";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function auto_redir(&$a, $contact_nick) {
|
function auto_redir(App $a, $contact_nick) {
|
||||||
|
|
||||||
// prevent looping
|
// prevent looping
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function can_write_wall(&$a,$owner) {
|
function can_write_wall(App $a, $owner) {
|
||||||
|
|
||||||
static $verified = 0;
|
static $verified = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -276,7 +276,7 @@ if(! function_exists('paginate_data')) {
|
||||||
* @param int $count [optional] item count (used with alt pager)
|
* @param int $count [optional] item count (used with alt pager)
|
||||||
* @return Array data for pagination template
|
* @return Array data for pagination template
|
||||||
*/
|
*/
|
||||||
function paginate_data(&$a, $count=null) {
|
function paginate_data(App $a, $count=null) {
|
||||||
$stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
|
$stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
|
||||||
|
|
||||||
$stripped = str_replace('q=','',$stripped);
|
$stripped = str_replace('q=','',$stripped);
|
||||||
|
|
@ -369,7 +369,7 @@ if(! function_exists('paginate')) {
|
||||||
* @param App $a App instance
|
* @param App $a App instance
|
||||||
* @return string html for pagination #FIXME remove html
|
* @return string html for pagination #FIXME remove html
|
||||||
*/
|
*/
|
||||||
function paginate(App &$a) {
|
function paginate(App $a) {
|
||||||
|
|
||||||
$data = paginate_data($a);
|
$data = paginate_data($a);
|
||||||
$tpl = get_markup_template("paginate.tpl");
|
$tpl = get_markup_template("paginate.tpl");
|
||||||
|
|
@ -384,7 +384,7 @@ if(! function_exists('alt_pager')) {
|
||||||
* @param int $i
|
* @param int $i
|
||||||
* @return string html for pagination #FIXME remove html
|
* @return string html for pagination #FIXME remove html
|
||||||
*/
|
*/
|
||||||
function alt_pager(&$a, $i) {
|
function alt_pager(App $a, $i) {
|
||||||
|
|
||||||
$data = paginate_data($a, $i);
|
$data = paginate_data($a, $i);
|
||||||
$tpl = get_markup_template("paginate.tpl");
|
$tpl = get_markup_template("paginate.tpl");
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ function import_cleanup($newuid) {
|
||||||
q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);
|
q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
function import_account(&$a, $file) {
|
function import_account(App $a, $file) {
|
||||||
logger("Start user import from " . $file['tmp_name']);
|
logger("Start user import from " . $file['tmp_name']);
|
||||||
/*
|
/*
|
||||||
STEPS
|
STEPS
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
require_once("mod/hostxrd.php");
|
require_once("mod/hostxrd.php");
|
||||||
require_once("mod/nodeinfo.php");
|
require_once("mod/nodeinfo.php");
|
||||||
|
|
||||||
function _well_known_init(App &$a){
|
function _well_known_init(App $a) {
|
||||||
if ($a->argc > 1) {
|
if ($a->argc > 1) {
|
||||||
switch($a->argv[1]) {
|
switch($a->argv[1]) {
|
||||||
case "host-meta":
|
case "host-meta":
|
||||||
|
|
@ -21,7 +21,7 @@ function _well_known_init(App &$a){
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
function wk_social_relay(App &$a) {
|
function wk_social_relay(App $a) {
|
||||||
|
|
||||||
define('SR_SCOPE_ALL', 'all');
|
define('SR_SCOPE_ALL', 'all');
|
||||||
define('SR_SCOPE_TAGS', 'tags');
|
define('SR_SCOPE_TAGS', 'tags');
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_once('include/Scrape.php');
|
require_once('include/Scrape.php');
|
||||||
|
|
||||||
function acctlink_init(App &$a) {
|
function acctlink_init(App $a) {
|
||||||
|
|
||||||
if(x($_GET,'addr')) {
|
if(x($_GET,'addr')) {
|
||||||
$addr = trim($_GET['addr']);
|
$addr = trim($_GET['addr']);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
require_once("include/acl_selectors.php");
|
require_once("include/acl_selectors.php");
|
||||||
|
|
||||||
function acl_init(App &$a){
|
function acl_init(App $a) {
|
||||||
acl_lookup($a);
|
acl_lookup($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ require_once("include/text.php");
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function admin_post(App &$a){
|
function admin_post(App $a) {
|
||||||
|
|
||||||
|
|
||||||
if(!is_site_admin()) {
|
if(!is_site_admin()) {
|
||||||
|
|
@ -66,7 +66,7 @@ function admin_post(App &$a){
|
||||||
|
|
||||||
$theme = $a->argv[2];
|
$theme = $a->argv[2];
|
||||||
if(is_file("view/theme/$theme/config.php")){
|
if(is_file("view/theme/$theme/config.php")){
|
||||||
function __call_theme_admin_post(&$a, $theme) {
|
function __call_theme_admin_post(App $a, $theme) {
|
||||||
$orig_theme = $a->theme;
|
$orig_theme = $a->theme;
|
||||||
$orig_page = $a->page;
|
$orig_page = $a->page;
|
||||||
$orig_session_theme = $_SESSION['theme'];
|
$orig_session_theme = $_SESSION['theme'];
|
||||||
|
|
@ -127,7 +127,7 @@ function admin_post(App &$a){
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_content(App &$a) {
|
function admin_content(App $a) {
|
||||||
|
|
||||||
if(!is_site_admin()) {
|
if(!is_site_admin()) {
|
||||||
return login(false);
|
return login(false);
|
||||||
|
|
@ -260,7 +260,7 @@ function admin_content(App &$a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_federation(App &$a) {
|
function admin_page_federation(App $a) {
|
||||||
// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
|
// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
|
||||||
// social and statusnet nodes this node is knowing
|
// social and statusnet nodes this node is knowing
|
||||||
//
|
//
|
||||||
|
|
@ -393,7 +393,7 @@ function admin_page_federation(App &$a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_queue(App &$a) {
|
function admin_page_queue(App $a) {
|
||||||
// get content from the queue table
|
// get content from the queue table
|
||||||
$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
|
$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
|
||||||
FROM `queue` AS `q`, `contact` AS `c`
|
FROM `queue` AS `q`, `contact` AS `c`
|
||||||
|
|
@ -427,7 +427,7 @@ function admin_page_queue(App &$a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_summary(App &$a) {
|
function admin_page_summary(App $a) {
|
||||||
global $db;
|
global $db;
|
||||||
// are there MyISAM tables in the DB? If so, trigger a warning message
|
// are there MyISAM tables in the DB? If so, trigger a warning message
|
||||||
$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
|
$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
|
||||||
|
|
@ -504,7 +504,7 @@ function admin_page_summary(App &$a) {
|
||||||
*
|
*
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function admin_page_site_post(App &$a) {
|
function admin_page_site_post(App $a) {
|
||||||
if(!x($_POST,"page_site")) {
|
if(!x($_POST,"page_site")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -845,7 +845,7 @@ function admin_page_site_post(App &$a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_site(App &$a) {
|
function admin_page_site(App $a) {
|
||||||
|
|
||||||
/* Installed langs */
|
/* Installed langs */
|
||||||
$lang_choices = get_available_languages();
|
$lang_choices = get_available_languages();
|
||||||
|
|
@ -1072,7 +1072,7 @@ function admin_page_site(App &$a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
**/
|
**/
|
||||||
function admin_page_dbsync(App &$a) {
|
function admin_page_dbsync(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
|
@ -1155,7 +1155,7 @@ function admin_page_dbsync(App &$a) {
|
||||||
*
|
*
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function admin_page_users_post(App &$a){
|
function admin_page_users_post(App $a) {
|
||||||
$pending = (x($_POST, 'pending') ? $_POST['pending'] : array());
|
$pending = (x($_POST, 'pending') ? $_POST['pending'] : array());
|
||||||
$users = (x($_POST, 'user') ? $_POST['user'] : array());
|
$users = (x($_POST, 'user') ? $_POST['user'] : array());
|
||||||
$nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
|
$nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
|
||||||
|
|
@ -1260,7 +1260,7 @@ function admin_page_users_post(App &$a){
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_users(App &$a){
|
function admin_page_users(App $a) {
|
||||||
if($a->argc>2) {
|
if($a->argc>2) {
|
||||||
$uid = $a->argv[3];
|
$uid = $a->argv[3];
|
||||||
$user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
|
$user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
|
||||||
|
|
@ -1460,7 +1460,7 @@ function admin_page_users(App &$a){
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_plugins(App &$a){
|
function admin_page_plugins(App $a) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Single plugin
|
* Single plugin
|
||||||
|
|
@ -1669,7 +1669,7 @@ function rebuild_theme_table($themes) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_themes(App &$a){
|
function admin_page_themes(App $a) {
|
||||||
|
|
||||||
$allowed_themes_str = get_config('system','allowed_themes');
|
$allowed_themes_str = get_config('system','allowed_themes');
|
||||||
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
||||||
|
|
@ -1749,7 +1749,7 @@ function admin_page_themes(App &$a){
|
||||||
|
|
||||||
$admin_form="";
|
$admin_form="";
|
||||||
if(is_file("view/theme/$theme/config.php")) {
|
if(is_file("view/theme/$theme/config.php")) {
|
||||||
function __get_theme_admin_form(&$a, $theme) {
|
function __get_theme_admin_form(App $a, $theme) {
|
||||||
$orig_theme = $a->theme;
|
$orig_theme = $a->theme;
|
||||||
$orig_page = $a->page;
|
$orig_page = $a->page;
|
||||||
$orig_session_theme = $_SESSION['theme'];
|
$orig_session_theme = $_SESSION['theme'];
|
||||||
|
|
@ -1850,7 +1850,7 @@ function admin_page_themes(App &$a){
|
||||||
*
|
*
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function admin_page_logs_post(App &$a) {
|
function admin_page_logs_post(App $a) {
|
||||||
if (x($_POST,"page_logs")) {
|
if (x($_POST,"page_logs")) {
|
||||||
check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
|
check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
|
||||||
|
|
||||||
|
|
@ -1884,7 +1884,7 @@ function admin_page_logs_post(App &$a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_logs(App &$a){
|
function admin_page_logs(App $a) {
|
||||||
|
|
||||||
$log_choices = array(
|
$log_choices = array(
|
||||||
LOGGER_NORMAL => 'Normal',
|
LOGGER_NORMAL => 'Normal',
|
||||||
|
|
@ -1941,7 +1941,7 @@ function admin_page_logs(App &$a){
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_viewlogs(App &$a){
|
function admin_page_viewlogs(App $a) {
|
||||||
$t = get_markup_template("admin_viewlogs.tpl");
|
$t = get_markup_template("admin_viewlogs.tpl");
|
||||||
$f = get_config('system','logfile');
|
$f = get_config('system','logfile');
|
||||||
$data = '';
|
$data = '';
|
||||||
|
|
@ -1983,7 +1983,7 @@ function admin_page_viewlogs(App &$a){
|
||||||
*
|
*
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function admin_page_features_post(App &$a) {
|
function admin_page_features_post(App $a) {
|
||||||
|
|
||||||
check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
|
check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
|
||||||
|
|
||||||
|
|
@ -2029,7 +2029,7 @@ function admin_page_features_post(App &$a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_features(App &$a) {
|
function admin_page_features(App $a) {
|
||||||
|
|
||||||
if((argc() > 1) && (argv(1) === 'features')) {
|
if((argc() > 1) && (argv(1) === 'features')) {
|
||||||
$arr = array();
|
$arr = array();
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ require_once('include/Contact.php');
|
||||||
require_once('include/contact_selectors.php');
|
require_once('include/contact_selectors.php');
|
||||||
require_once('mod/contacts.php');
|
require_once('mod/contacts.php');
|
||||||
|
|
||||||
function allfriends_content(App &$a) {
|
function allfriends_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function amcd_content(App &$a) {
|
function amcd_content(App $a) {
|
||||||
//header("Content-type: text/json");
|
//header("Content-type: text/json");
|
||||||
echo <<< EOT
|
echo <<< EOT
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ function oauth_get_client($request){
|
||||||
return $r[0];
|
return $r[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
function api_post(App &$a) {
|
function api_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
@ -34,7 +34,7 @@ function api_post(App &$a) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function api_content(App &$a) {
|
function api_content(App $a) {
|
||||||
if ($a->cmd=='api/oauth/authorize'){
|
if ($a->cmd=='api/oauth/authorize'){
|
||||||
/*
|
/*
|
||||||
* api/oauth/authorize interact with the user. return a standard page
|
* api/oauth/authorize interact with the user. return a standard page
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function apps_content(App &$a) {
|
function apps_content(App $a) {
|
||||||
$privateaddons = get_config('config','private_addons');
|
$privateaddons = get_config('config','private_addons');
|
||||||
if ($privateaddons === "1") {
|
if ($privateaddons === "1") {
|
||||||
if((! (local_user()))) {
|
if((! (local_user()))) {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_once('include/security.php');
|
require_once('include/security.php');
|
||||||
|
|
||||||
function attach_init(App &$a) {
|
function attach_init(App $a) {
|
||||||
|
|
||||||
if($a->argc != 2) {
|
if($a->argc != 2) {
|
||||||
notice( t('Item not available.') . EOL);
|
notice( t('Item not available.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ function visible_lf($s) {
|
||||||
return str_replace("\n",'<br />', $s);
|
return str_replace("\n",'<br />', $s);
|
||||||
}
|
}
|
||||||
|
|
||||||
function babel_content(App &$a) {
|
function babel_content(App $a) {
|
||||||
|
|
||||||
$o .= '<h1>Babel Diagnostic</h1>';
|
$o .= '<h1>Babel Diagnostic</h1>';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,11 @@
|
||||||
require_once('include/conversation.php');
|
require_once('include/conversation.php');
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
|
|
||||||
function bookmarklet_init(App &$a) {
|
function bookmarklet_init(App $a) {
|
||||||
$_GET["mode"] = "minimal";
|
$_GET["mode"] = "minimal";
|
||||||
}
|
}
|
||||||
|
|
||||||
function bookmarklet_content(App &$a) {
|
function bookmarklet_content(App $a) {
|
||||||
if (!local_user()) {
|
if (!local_user()) {
|
||||||
$o = '<h2>'.t('Login').'</h2>';
|
$o = '<h2>'.t('Login').'</h2>';
|
||||||
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
|
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
require_once('include/event.php');
|
require_once('include/event.php');
|
||||||
require_once('include/redir.php');
|
require_once('include/redir.php');
|
||||||
|
|
||||||
function cal_init(App &$a) {
|
function cal_init(App $a) {
|
||||||
if($a->argc > 1)
|
if($a->argc > 1)
|
||||||
auto_redir($a, $a->argv[1]);
|
auto_redir($a, $a->argv[1]);
|
||||||
|
|
||||||
|
|
@ -64,7 +64,7 @@ function cal_init(App &$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function cal_content(App &$a) {
|
function cal_content(App $a) {
|
||||||
nav_set_selected('events');
|
nav_set_selected('events');
|
||||||
|
|
||||||
$editselect = 'none';
|
$editselect = 'none';
|
||||||
|
|
|
||||||
|
|
@ -5,19 +5,19 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
function cb_init(App &$a) {
|
function cb_init(App $a) {
|
||||||
call_hooks('cb_init');
|
call_hooks('cb_init');
|
||||||
}
|
}
|
||||||
|
|
||||||
function cb_post(App &$a) {
|
function cb_post(App $a) {
|
||||||
call_hooks('cb_post', $_POST);
|
call_hooks('cb_post', $_POST);
|
||||||
}
|
}
|
||||||
|
|
||||||
function cb_afterpost(App &$a) {
|
function cb_afterpost(App $a) {
|
||||||
call_hooks('cb_afterpost');
|
call_hooks('cb_afterpost');
|
||||||
}
|
}
|
||||||
|
|
||||||
function cb_content(App &$a) {
|
function cb_content(App $a) {
|
||||||
$o = '';
|
$o = '';
|
||||||
call_hooks('cb_content', $o);
|
call_hooks('cb_content', $o);
|
||||||
return $o;
|
return $o;
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ require_once('include/Contact.php');
|
||||||
require_once('include/contact_selectors.php');
|
require_once('include/contact_selectors.php');
|
||||||
require_once('mod/contacts.php');
|
require_once('mod/contacts.php');
|
||||||
|
|
||||||
function common_content(App &$a) {
|
function common_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function community_init(App &$a) {
|
function community_init(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
unset($_SESSION['theme']);
|
unset($_SESSION['theme']);
|
||||||
unset($_SESSION['mobile-theme']);
|
unset($_SESSION['mobile-theme']);
|
||||||
|
|
@ -10,7 +10,7 @@ function community_init(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function community_content(&$a, $update = 0) {
|
function community_content(App $a, $update = 0) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_once('include/group.php');
|
require_once('include/group.php');
|
||||||
|
|
||||||
function contactgroup_content(App &$a) {
|
function contactgroup_content(App $a) {
|
||||||
|
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ require_once('include/Scrape.php');
|
||||||
require_once('mod/proxy.php');
|
require_once('mod/proxy.php');
|
||||||
require_once('include/Photo.php');
|
require_once('include/Photo.php');
|
||||||
|
|
||||||
function contacts_init(App &$a) {
|
function contacts_init(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -97,7 +97,7 @@ function contacts_init(App &$a) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function contacts_batch_actions(App &$a){
|
function contacts_batch_actions(App $a) {
|
||||||
$contacts_id = $_POST['contact_batch'];
|
$contacts_id = $_POST['contact_batch'];
|
||||||
if (!is_array($contacts_id)) return;
|
if (!is_array($contacts_id)) return;
|
||||||
|
|
||||||
|
|
@ -144,7 +144,7 @@ function contacts_batch_actions(App &$a){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function contacts_post(App &$a) {
|
function contacts_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -349,7 +349,7 @@ function _contact_drop($contact_id, $orig_record) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function contacts_content(App &$a) {
|
function contacts_content(App $a) {
|
||||||
|
|
||||||
$sort_type = 0;
|
$sort_type = 0;
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
// and 10-20 milliseconds to fetch all the child items.
|
// and 10-20 milliseconds to fetch all the child items.
|
||||||
|
|
||||||
|
|
||||||
function content_content(&$a, $update = 0) {
|
function content_content(App $a, $update = 0) {
|
||||||
|
|
||||||
require_once('include/conversation.php');
|
require_once('include/conversation.php');
|
||||||
|
|
||||||
|
|
@ -307,7 +307,7 @@ function content_content(&$a, $update = 0) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function render_content(&$a, $items, $mode, $update, $preview = false) {
|
function render_content(App $a, $items, $mode, $update, $preview = false) {
|
||||||
|
|
||||||
require_once('include/bbcode.php');
|
require_once('include/bbcode.php');
|
||||||
require_once('mod/proxy.php');
|
require_once('mod/proxy.php');
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
* addons repository will be listed though ATM)
|
* addons repository will be listed though ATM)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function credits_content (App &$a) {
|
function credits_content (App $a) {
|
||||||
/* fill the page with credits */
|
/* fill the page with credits */
|
||||||
$f = fopen('util/credits.txt','r');
|
$f = fopen('util/credits.txt','r');
|
||||||
$names = fread($f, filesize('util/credits.txt'));
|
$names = fread($f, filesize('util/credits.txt'));
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
require_once("include/contact_selectors.php");
|
require_once("include/contact_selectors.php");
|
||||||
require_once("mod/contacts.php");
|
require_once("mod/contacts.php");
|
||||||
|
|
||||||
function crepair_init(App &$a) {
|
function crepair_init(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -30,7 +30,7 @@ function crepair_init(App &$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function crepair_post(App &$a) {
|
function crepair_post(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -96,7 +96,7 @@ function crepair_post(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function crepair_content(App &$a) {
|
function crepair_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<?php
|
<?php
|
||||||
require_once('mod/settings.php');
|
require_once('mod/settings.php');
|
||||||
|
|
||||||
function delegate_init(App &$a) {
|
function delegate_init(App $a) {
|
||||||
return settings_init($a);
|
return settings_init($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function delegate_content(App &$a) {
|
function delegate_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ require_once('include/enotify.php');
|
||||||
require_once('include/group.php');
|
require_once('include/group.php');
|
||||||
require_once('include/Probe.php');
|
require_once('include/Probe.php');
|
||||||
|
|
||||||
function dfrn_confirm_post(&$a,$handsfree = null) {
|
function dfrn_confirm_post(App $a, $handsfree = null) {
|
||||||
|
|
||||||
if(is_array($handsfree)) {
|
if(is_array($handsfree)) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ require_once('include/event.php');
|
||||||
|
|
||||||
require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
|
require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
|
||||||
|
|
||||||
function dfrn_notify_post(App &$a) {
|
function dfrn_notify_post(App $a) {
|
||||||
logger(__function__, LOGGER_TRACE);
|
logger(__function__, LOGGER_TRACE);
|
||||||
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
|
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
|
||||||
$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
|
$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
|
||||||
|
|
@ -221,7 +221,7 @@ function dfrn_notify_post(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function dfrn_notify_content(App &$a) {
|
function dfrn_notify_content(App $a) {
|
||||||
|
|
||||||
if(x($_GET,'dfrn_id')) {
|
if(x($_GET,'dfrn_id')) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ require_once('include/auth.php');
|
||||||
require_once('include/dfrn.php');
|
require_once('include/dfrn.php');
|
||||||
|
|
||||||
|
|
||||||
function dfrn_poll_init(App &$a) {
|
function dfrn_poll_init(App $a) {
|
||||||
|
|
||||||
|
|
||||||
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
|
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
|
||||||
|
|
@ -203,7 +203,7 @@ function dfrn_poll_init(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function dfrn_poll_post(App &$a) {
|
function dfrn_poll_post(App $a) {
|
||||||
|
|
||||||
$dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : '');
|
$dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : '');
|
||||||
$challenge = ((x($_POST,'challenge')) ? $_POST['challenge'] : '');
|
$challenge = ((x($_POST,'challenge')) ? $_POST['challenge'] : '');
|
||||||
|
|
@ -383,7 +383,7 @@ function dfrn_poll_post(App &$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function dfrn_poll_content(App &$a) {
|
function dfrn_poll_content(App $a) {
|
||||||
|
|
||||||
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
|
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
|
||||||
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data');
|
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data');
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ require_once('include/Scrape.php');
|
||||||
require_once('include/Probe.php');
|
require_once('include/Probe.php');
|
||||||
require_once('include/group.php');
|
require_once('include/group.php');
|
||||||
|
|
||||||
function dfrn_request_init(App &$a) {
|
function dfrn_request_init(App $a) {
|
||||||
|
|
||||||
if($a->argc > 1)
|
if($a->argc > 1)
|
||||||
$which = $a->argv[1];
|
$which = $a->argv[1];
|
||||||
|
|
@ -42,7 +42,7 @@ function dfrn_request_init(App &$a) {
|
||||||
* After logging in, we click 'submit' to approve the linkage.
|
* After logging in, we click 'submit' to approve the linkage.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function dfrn_request_post(App &$a) {
|
function dfrn_request_post(App $a) {
|
||||||
|
|
||||||
if(($a->argc != 2) || (! count($a->profile))) {
|
if(($a->argc != 2) || (! count($a->profile))) {
|
||||||
logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
|
logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
|
||||||
|
|
@ -658,7 +658,7 @@ function dfrn_request_post(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function dfrn_request_content(App &$a) {
|
function dfrn_request_content(App $a) {
|
||||||
|
|
||||||
if (($a->argc != 2) || (! count($a->profile))) {
|
if (($a->argc != 2) || (! count($a->profile))) {
|
||||||
return "";
|
return "";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function directory_init(App &$a) {
|
function directory_init(App $a) {
|
||||||
$a->set_pager_itemspage(60);
|
$a->set_pager_itemspage(60);
|
||||||
|
|
||||||
if(local_user()) {
|
if(local_user()) {
|
||||||
|
|
@ -20,14 +20,14 @@ function directory_init(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function directory_post(App &$a) {
|
function directory_post(App $a) {
|
||||||
if(x($_POST,'search'))
|
if(x($_POST,'search'))
|
||||||
$a->data['search'] = $_POST['search'];
|
$a->data['search'] = $_POST['search'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function directory_content(App &$a) {
|
function directory_content(App $a) {
|
||||||
global $db;
|
global $db;
|
||||||
|
|
||||||
require_once("mod/proxy.php");
|
require_once("mod/proxy.php");
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ require_once('include/Contact.php');
|
||||||
require_once('include/contact_selectors.php');
|
require_once('include/contact_selectors.php');
|
||||||
require_once('mod/contacts.php');
|
require_once('mod/contacts.php');
|
||||||
|
|
||||||
function dirfind_init(App &$a) {
|
function dirfind_init(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL );
|
notice( t('Permission denied.') . EOL );
|
||||||
|
|
@ -23,7 +23,7 @@ function dirfind_init(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function dirfind_content(&$a, $prefix = "") {
|
function dirfind_content(App $a, $prefix = "") {
|
||||||
|
|
||||||
$community = false;
|
$community = false;
|
||||||
$discover_user = false;
|
$discover_user = false;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function display_init(App &$a) {
|
function display_init(App $a) {
|
||||||
|
|
||||||
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -194,7 +194,7 @@ function display_fetchauthor($a, $item) {
|
||||||
return($profiledata);
|
return($profiledata);
|
||||||
}
|
}
|
||||||
|
|
||||||
function display_content(&$a, $update = 0) {
|
function display_content(App $a, $update = 0) {
|
||||||
|
|
||||||
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||||
notice(t('Public access denied.') . EOL);
|
notice(t('Public access denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_once('include/acl_selectors.php');
|
require_once('include/acl_selectors.php');
|
||||||
|
|
||||||
function editpost_content(App &$a) {
|
function editpost_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ require_once('include/datetime.php');
|
||||||
require_once('include/event.php');
|
require_once('include/event.php');
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
|
|
||||||
function events_init(App &$a) {
|
function events_init(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -31,7 +31,7 @@ function events_init(App &$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function events_post(App &$a) {
|
function events_post(App $a) {
|
||||||
|
|
||||||
logger('post: ' . print_r($_REQUEST,true));
|
logger('post: ' . print_r($_REQUEST,true));
|
||||||
|
|
||||||
|
|
@ -189,7 +189,7 @@ function events_post(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function events_content(App &$a) {
|
function events_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ require_once('include/Photo.php');
|
||||||
/**
|
/**
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function fbrowser_content(App &$a){
|
function fbrowser_content(App $a) {
|
||||||
|
|
||||||
if (!local_user())
|
if (!local_user())
|
||||||
killme();
|
killme();
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,7 @@ require_once("include/crypto.php");
|
||||||
require_once("include/diaspora.php");
|
require_once("include/diaspora.php");
|
||||||
require_once("include/xml.php");
|
require_once("include/xml.php");
|
||||||
|
|
||||||
/// @TODO You always make it like this: function foo(&$a)
|
function fetch_init(App $a) {
|
||||||
/// @TODO This means that the value of $a can be changed in anything, remove & and use App as type-hint
|
|
||||||
function fetch_init(App &$a){
|
|
||||||
|
|
||||||
if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
|
if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
|
||||||
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
|
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ require_once('include/bbcode.php');
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
|
|
||||||
|
|
||||||
function filer_content(App &$a) {
|
function filer_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
killme();
|
killme();
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function filerm_content(App &$a) {
|
function filerm_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
killme();
|
killme();
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ 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) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
@ -152,7 +152,7 @@ function follow_content(App &$a) {
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
function follow_post(App &$a) {
|
function follow_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function friendica_init(App &$a) {
|
function friendica_init(App $a) {
|
||||||
if ($a->argv[1]=="json"){
|
if ($a->argv[1]=="json"){
|
||||||
$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
|
$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
|
||||||
|
|
||||||
|
|
@ -59,7 +59,7 @@ function friendica_init(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function friendica_content(App &$a) {
|
function friendica_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
$o .= '<h3>Friendica</h3>';
|
$o .= '<h3>Friendica</h3>';
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
function fsuggest_post(App &$a) {
|
function fsuggest_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -71,7 +71,7 @@ function fsuggest_post(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function fsuggest_content(App &$a) {
|
function fsuggest_content(App $a) {
|
||||||
|
|
||||||
require_once('include/acl_selectors.php');
|
require_once('include/acl_selectors.php');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ function validate_members(&$item) {
|
||||||
$item = intval($item);
|
$item = intval($item);
|
||||||
}
|
}
|
||||||
|
|
||||||
function group_init(App &$a) {
|
function group_init(App $a) {
|
||||||
if(local_user()) {
|
if(local_user()) {
|
||||||
require_once('include/group.php');
|
require_once('include/group.php');
|
||||||
$a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
|
$a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
|
||||||
|
|
@ -13,7 +13,7 @@ function group_init(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function group_post(App &$a) {
|
function group_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
@ -69,7 +69,7 @@ function group_post(App &$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function group_content(App &$a) {
|
function group_content(App $a) {
|
||||||
$change = false;
|
$change = false;
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function hcard_init(App &$a) {
|
function hcard_init(App $a) {
|
||||||
|
|
||||||
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
|
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ if (!function_exists('load_doc_file')) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function help_content(App &$a) {
|
function help_content(App $a) {
|
||||||
|
|
||||||
nav_set_selected('help');
|
nav_set_selected('help');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if(! function_exists('home_init')) {
|
if(! function_exists('home_init')) {
|
||||||
function home_init(App &$a) {
|
function home_init(App $a) {
|
||||||
|
|
||||||
$ret = array();
|
$ret = array();
|
||||||
call_hooks('home_init',$ret);
|
call_hooks('home_init',$ret);
|
||||||
|
|
@ -17,7 +17,7 @@ function home_init(App &$a) {
|
||||||
}}
|
}}
|
||||||
|
|
||||||
if(! function_exists('home_content')) {
|
if(! function_exists('home_content')) {
|
||||||
function home_content(App &$a) {
|
function home_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_once('include/crypto.php');
|
require_once('include/crypto.php');
|
||||||
|
|
||||||
function hostxrd_init(App &$a) {
|
function hostxrd_init(App $a) {
|
||||||
header('Access-Control-Allow-Origin: *');
|
header('Access-Control-Allow-Origin: *');
|
||||||
header("Content-type: text/xml");
|
header("Content-type: text/xml");
|
||||||
$pubkey = get_config('system','site_pubkey');
|
$pubkey = get_config('system','site_pubkey');
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
require_once("include/socgraph.php");
|
require_once("include/socgraph.php");
|
||||||
require_once("include/Contact.php");
|
require_once("include/Contact.php");
|
||||||
|
|
||||||
function hovercard_init(App &$a) {
|
function hovercard_init(App $a) {
|
||||||
// Just for testing purposes
|
// Just for testing purposes
|
||||||
$_GET["mode"] = "minimal";
|
$_GET["mode"] = "minimal";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
function ignored_init(App &$a) {
|
function ignored_init(App $a) {
|
||||||
|
|
||||||
$ignored = 0;
|
$ignored = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ require_once "include/Photo.php";
|
||||||
$install_wizard_pass=1;
|
$install_wizard_pass=1;
|
||||||
|
|
||||||
|
|
||||||
function install_init(App &$a){
|
function install_init(App $a) {
|
||||||
|
|
||||||
// $baseurl/install/testrwrite to test if rewite in .htaccess is working
|
// $baseurl/install/testrwrite to test if rewite in .htaccess is working
|
||||||
if ($a->argc==2 && $a->argv[1]=="testrewrite") {
|
if ($a->argc==2 && $a->argv[1]=="testrewrite") {
|
||||||
|
|
@ -24,7 +24,7 @@ function install_init(App &$a){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_post(App &$a) {
|
function install_post(App $a) {
|
||||||
global $install_wizard_pass, $db;
|
global $install_wizard_pass, $db;
|
||||||
|
|
||||||
switch($install_wizard_pass) {
|
switch($install_wizard_pass) {
|
||||||
|
|
@ -132,7 +132,7 @@ function get_db_errno() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_content(App &$a) {
|
function install_content(App $a) {
|
||||||
|
|
||||||
global $install_wizard_pass, $db;
|
global $install_wizard_pass, $db;
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
@ -565,7 +565,7 @@ function check_imagik(&$checks) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function manual_config(App &$a) {
|
function manual_config(App $a) {
|
||||||
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
|
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
|
||||||
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
|
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
|
||||||
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
|
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
require_once('include/email.php');
|
require_once('include/email.php');
|
||||||
|
|
||||||
function invite_post(App &$a) {
|
function invite_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
@ -97,7 +97,7 @@ function invite_post(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function invite_content(App &$a) {
|
function invite_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ require_once('include/Scrape.php');
|
||||||
require_once('include/diaspora.php');
|
require_once('include/diaspora.php');
|
||||||
require_once('include/Contact.php');
|
require_once('include/Contact.php');
|
||||||
|
|
||||||
function item_post(App &$a) {
|
function item_post(App $a) {
|
||||||
|
|
||||||
if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
|
if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
|
||||||
return;
|
return;
|
||||||
|
|
@ -1066,7 +1066,7 @@ function item_post_return($baseurl, $api_source, $return_path) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function item_content(App &$a) {
|
function item_content(App $a) {
|
||||||
|
|
||||||
if ((! local_user()) && (! remote_user())) {
|
if ((! local_user()) && (! remote_user())) {
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ require_once('include/bbcode.php');
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
require_once('include/like.php');
|
require_once('include/like.php');
|
||||||
|
|
||||||
function like_content(App &$a) {
|
function like_content(App $a) {
|
||||||
if(! local_user() && ! remote_user()) {
|
if(! local_user() && ! remote_user()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
require_once('include/datetime.php');
|
require_once('include/datetime.php');
|
||||||
|
|
||||||
|
|
||||||
function localtime_post(App &$a) {
|
function localtime_post(App $a) {
|
||||||
|
|
||||||
$t = $_REQUEST['time'];
|
$t = $_REQUEST['time'];
|
||||||
if(! $t)
|
if(! $t)
|
||||||
|
|
@ -16,7 +16,7 @@ function localtime_post(App &$a) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function localtime_content(App &$a) {
|
function localtime_content(App $a) {
|
||||||
$t = $_REQUEST['time'];
|
$t = $_REQUEST['time'];
|
||||||
if(! $t)
|
if(! $t)
|
||||||
$t = 'now';
|
$t = 'now';
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
function lockview_content(App &$a) {
|
function lockview_content(App $a) {
|
||||||
|
|
||||||
$type = (($a->argc > 1) ? $a->argv[1] : 0);
|
$type = (($a->argc > 1) ? $a->argv[1] : 0);
|
||||||
if (is_numeric($type)) {
|
if (is_numeric($type)) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function login_content(App &$a) {
|
function login_content(App $a) {
|
||||||
if(x($_SESSION,'theme'))
|
if(x($_SESSION,'theme'))
|
||||||
unset($_SESSION['theme']);
|
unset($_SESSION['theme']);
|
||||||
if(x($_SESSION,'mobile-theme'))
|
if(x($_SESSION,'mobile-theme'))
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ require_once('include/email.php');
|
||||||
require_once('include/enotify.php');
|
require_once('include/enotify.php');
|
||||||
require_once('include/text.php');
|
require_once('include/text.php');
|
||||||
|
|
||||||
function lostpass_post(App &$a) {
|
function lostpass_post(App $a) {
|
||||||
|
|
||||||
$loginame = notags(trim($_POST['login-name']));
|
$loginame = notags(trim($_POST['login-name']));
|
||||||
if(! $loginame)
|
if(! $loginame)
|
||||||
|
|
@ -77,7 +77,7 @@ function lostpass_post(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function lostpass_content(App &$a) {
|
function lostpass_content(App $a) {
|
||||||
|
|
||||||
|
|
||||||
if(x($_GET,'verify')) {
|
if(x($_GET,'verify')) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function maintenance_content(App &$a) {
|
function maintenance_content(App $a) {
|
||||||
header('HTTP/1.1 503 Service Temporarily Unavailable');
|
header('HTTP/1.1 503 Service Temporarily Unavailable');
|
||||||
header('Status: 503 Service Temporarily Unavailable');
|
header('Status: 503 Service Temporarily Unavailable');
|
||||||
header('Retry-After: 600');
|
header('Retry-After: 600');
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
require_once("include/text.php");
|
require_once("include/text.php");
|
||||||
|
|
||||||
|
|
||||||
function manage_post(App &$a) {
|
function manage_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -92,7 +92,7 @@ function manage_post(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function manage_content(App &$a) {
|
function manage_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,10 @@ require_once('mod/proxy.php');
|
||||||
* It takes keywords from your profile and queries the directory server for
|
* It takes keywords from your profile and queries the directory server for
|
||||||
* matching keywords from other profiles.
|
* matching keywords from other profiles.
|
||||||
*
|
*
|
||||||
* @param App &$a
|
* @param App $a
|
||||||
* @return void|string
|
* @return void|string
|
||||||
*/
|
*/
|
||||||
function match_content(App &$a) {
|
function match_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ require_once('include/acl_selectors.php');
|
||||||
require_once('include/message.php');
|
require_once('include/message.php');
|
||||||
require_once('include/Smilies.php');
|
require_once('include/Smilies.php');
|
||||||
|
|
||||||
function message_init(App &$a) {
|
function message_init(App $a) {
|
||||||
|
|
||||||
$tabs = '';
|
$tabs = '';
|
||||||
|
|
||||||
|
|
@ -40,7 +40,7 @@ function message_init(App &$a) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function message_post(App &$a) {
|
function message_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
@ -173,7 +173,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function message_content(App &$a) {
|
function message_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
nav_set_selected('messages');
|
nav_set_selected('messages');
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_once('library/asn1.php');
|
require_once('library/asn1.php');
|
||||||
|
|
||||||
function modexp_init(App &$a) {
|
function modexp_init(App $a) {
|
||||||
|
|
||||||
if($a->argc != 2)
|
if($a->argc != 2)
|
||||||
killme();
|
killme();
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ require_once('include/bbcode.php');
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
|
|
||||||
|
|
||||||
function mood_init(App &$a) {
|
function mood_init(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -109,7 +109,7 @@ function mood_init(App &$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function mood_content(App &$a) {
|
function mood_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function msearch_post(App &$a) {
|
function msearch_post(App $a) {
|
||||||
|
|
||||||
$perpage = (($_POST['n']) ? $_POST['n'] : 80);
|
$perpage = (($_POST['n']) ? $_POST['n'] : 80);
|
||||||
$page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
|
$page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require_once("include/nav.php");
|
require_once("include/nav.php");
|
||||||
|
|
||||||
function navigation_content(App &$a) {
|
function navigation_content(App $a) {
|
||||||
|
|
||||||
$nav_info = nav_info($a);
|
$nav_info = nav_info($a);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
function network_init(App &$a) {
|
function network_init(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
|
|
@ -221,7 +221,7 @@ function saved_searches($search) {
|
||||||
*
|
*
|
||||||
* @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
|
* @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
|
||||||
*/
|
*/
|
||||||
function network_query_get_sel_tab(App &$a) {
|
function network_query_get_sel_tab(App $a) {
|
||||||
$no_active='';
|
$no_active='';
|
||||||
$starred_active = '';
|
$starred_active = '';
|
||||||
$new_active = '';
|
$new_active = '';
|
||||||
|
|
@ -292,7 +292,7 @@ function network_query_get_sel_net() {
|
||||||
return $network;
|
return $network;
|
||||||
}
|
}
|
||||||
|
|
||||||
function network_query_get_sel_group(App &$a) {
|
function network_query_get_sel_group(App $a) {
|
||||||
$group = false;
|
$group = false;
|
||||||
|
|
||||||
if($a->argc >= 2 && is_numeric($a->argv[1])) {
|
if($a->argc >= 2 && is_numeric($a->argv[1])) {
|
||||||
|
|
@ -303,7 +303,7 @@ function network_query_get_sel_group(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function network_content(&$a, $update = 0) {
|
function network_content(App $a, $update = 0) {
|
||||||
|
|
||||||
require_once('include/conversation.php');
|
require_once('include/conversation.php');
|
||||||
|
|
||||||
|
|
@ -809,7 +809,7 @@ function network_content(&$a, $update = 0) {
|
||||||
* @param app $a The global App
|
* @param app $a The global App
|
||||||
* @return string Html of the networktab
|
* @return string Html of the networktab
|
||||||
*/
|
*/
|
||||||
function network_tabs(App &$a) {
|
function network_tabs(App $a) {
|
||||||
// item filter tabs
|
// item filter tabs
|
||||||
/// @TODO fix this logic, reduce duplication
|
/// @TODO fix this logic, reduce duplication
|
||||||
/// $a->page['content'] .= '<div class="tabs-wrapper">';
|
/// $a->page['content'] .= '<div class="tabs-wrapper">';
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function newmember_content(App &$a) {
|
function newmember_content(App $a) {
|
||||||
|
|
||||||
|
|
||||||
$o = '<h1>' . t('Welcome to Friendica') . '</h1>';
|
$o = '<h1>' . t('Welcome to Friendica') . '</h1>';
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
require_once("include/plugin.php");
|
require_once("include/plugin.php");
|
||||||
|
|
||||||
function nodeinfo_wellknown(App &$a) {
|
function nodeinfo_wellknown(App $a) {
|
||||||
if (!get_config("system", "nodeinfo")) {
|
if (!get_config("system", "nodeinfo")) {
|
||||||
http_status_exit(404);
|
http_status_exit(404);
|
||||||
killme();
|
killme();
|
||||||
|
|
@ -20,7 +20,7 @@ function nodeinfo_wellknown(App &$a) {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
function nodeinfo_init(App &$a){
|
function nodeinfo_init(App $a) {
|
||||||
if (!get_config("system", "nodeinfo")) {
|
if (!get_config("system", "nodeinfo")) {
|
||||||
http_status_exit(404);
|
http_status_exit(404);
|
||||||
killme();
|
killme();
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ require_once('include/Contact.php');
|
||||||
require_once('include/socgraph.php');
|
require_once('include/socgraph.php');
|
||||||
require_once('include/contact_selectors.php');
|
require_once('include/contact_selectors.php');
|
||||||
|
|
||||||
function nogroup_init(App &$a) {
|
function nogroup_init(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -21,7 +21,7 @@ function nogroup_init(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function nogroup_content(App &$a) {
|
function nogroup_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function noscrape_init(App &$a) {
|
function noscrape_init(App $a) {
|
||||||
|
|
||||||
if($a->argc > 1)
|
if($a->argc > 1)
|
||||||
$which = $a->argv[1];
|
$which = $a->argv[1];
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function notes_init(App &$a) {
|
function notes_init(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -17,7 +17,7 @@ function notes_init(App &$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function notes_content(&$a,$update = false) {
|
function notes_content(App $a, $update = false) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
/* identi.ca -> friendica items permanent-url compatibility */
|
/* identi.ca -> friendica items permanent-url compatibility */
|
||||||
|
|
||||||
function notice_init(App &$a){
|
function notice_init(App $a) {
|
||||||
$id = $a->argv[1];
|
$id = $a->argv[1];
|
||||||
$r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
|
$r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
|
||||||
intval($id)
|
intval($id)
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ require_once("include/NotificationsManager.php");
|
||||||
require_once("include/contact_selectors.php");
|
require_once("include/contact_selectors.php");
|
||||||
require_once("include/network.php");
|
require_once("include/network.php");
|
||||||
|
|
||||||
function notifications_post(App &$a) {
|
function notifications_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
|
|
@ -65,7 +65,7 @@ function notifications_post(App &$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function notifications_content(App &$a) {
|
function notifications_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
require_once('include/NotificationsManager.php');
|
require_once('include/NotificationsManager.php');
|
||||||
|
|
||||||
function notify_init(App &$a) {
|
function notify_init(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -39,7 +39,7 @@ function notify_init(App &$a) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function notify_content(App &$a) {
|
function notify_content(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
return login();
|
return login();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
require_once("include/oembed.php");
|
require_once("include/oembed.php");
|
||||||
|
|
||||||
function oembed_content(App &$a){
|
function oembed_content(App $a) {
|
||||||
// logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
|
// logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
|
||||||
|
|
||||||
if ($a->argv[1]=='b2h'){
|
if ($a->argv[1]=='b2h'){
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
|
function oexchange_init(App $a) {
|
||||||
function oexchange_init(App &$a) {
|
|
||||||
|
|
||||||
if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
|
if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
|
||||||
$tpl = get_markup_template('oexchange_xrd.tpl');
|
$tpl = get_markup_template('oexchange_xrd.tpl');
|
||||||
|
|
@ -11,7 +10,7 @@ function oexchange_init(App &$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function oexchange_content(App &$a) {
|
function oexchange_content(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
$o = login(false);
|
$o = login(false);
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
require_once('library/openid.php');
|
require_once('library/openid.php');
|
||||||
|
|
||||||
|
|
||||||
function openid_content(App &$a) {
|
function openid_content(App $a) {
|
||||||
|
|
||||||
$noid = get_config('system','no_openid');
|
$noid = get_config('system','no_openid');
|
||||||
if($noid)
|
if($noid)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
function opensearch_content(App &$a) {
|
function opensearch_content(App $a) {
|
||||||
|
|
||||||
$tpl = get_markup_template('opensearch.tpl');
|
$tpl = get_markup_template('opensearch.tpl');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
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) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ use \Friendica\ParseUrl;
|
||||||
|
|
||||||
require_once("include/items.php");
|
require_once("include/items.php");
|
||||||
|
|
||||||
function parse_url_content(App &$a) {
|
function parse_url_content(App $a) {
|
||||||
|
|
||||||
$text = null;
|
$text = null;
|
||||||
$str_tags = "";
|
$str_tags = "";
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue