MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Normalize App parameter declaration (mod folder, 1 out of 3)

Browse source
This commit is contained in:
Hypolite Petovan 2017-01-09 23:12:54 +11:00
parent ee39aba490
commit 8a197055e3
42 changed files with 172 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/_well_known.php
View file

@ -3,7 +3,7 @@
require_once("mod/hostxrd.php");
require_once("mod/nodeinfo.php");
function _well_known_init(App &$a){
function _well_known_init(App $a) {
if ($a->argc > 1) {
switch($a->argv[1]) {
case "host-meta":
@ -21,7 +21,7 @@ function _well_known_init(App &$a){
killme();
}
function wk_social_relay(App &$a) {
function wk_social_relay(App $a) {
define('SR_SCOPE_ALL', 'all');
define('SR_SCOPE_TAGS', 'tags');

2
mod/acctlink.php
View file

@ -2,7 +2,7 @@
require_once('include/Scrape.php');
function acctlink_init(App &$a) {
function acctlink_init(App $a) {
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);

2
mod/acl.php
View file

@ -3,7 +3,7 @@
require_once("include/acl_selectors.php");
function acl_init(App &$a){
function acl_init(App $a) {
acl_lookup($a);
}

38
mod/admin.php
View file

@ -23,7 +23,7 @@ require_once("include/text.php");
* @param App $a
*
*/
function admin_post(App &$a){
function admin_post(App $a) {
if(!is_site_admin()) {
@ -66,7 +66,7 @@ function admin_post(App &$a){
$theme = $a->argv[2];
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_page = $a->page;
$orig_session_theme = $_SESSION['theme'];
@ -127,7 +127,7 @@ function admin_post(App &$a){
* @param App $a
* @return string
*/
function admin_content(App &$a) {
function admin_content(App $a) {
if(!is_site_admin()) {
return login(false);
@ -260,7 +260,7 @@ function admin_content(App &$a) {
* @param App $a
* @return string
*/
function admin_page_federation(App &$a) {
function admin_page_federation(App $a) {
// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
// social and statusnet nodes this node is knowing
//
@ -393,7 +393,7 @@ function admin_page_federation(App &$a) {
* @param App $a
* @return string
*/
function admin_page_queue(App &$a) {
function admin_page_queue(App $a) {
// get content from the queue table
$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
FROM `queue` AS `q`, `contact` AS `c`
@ -427,7 +427,7 @@ function admin_page_queue(App &$a) {
* @param App $a
* @return string
*/
function admin_page_summary(App &$a) {
function admin_page_summary(App $a) {
global $db;
// 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",
@ -504,7 +504,7 @@ function admin_page_summary(App &$a) {
*
* @param App $a
*/
function admin_page_site_post(App &$a) {
function admin_page_site_post(App $a) {
if(!x($_POST,"page_site")) {
return;
}
@ -845,7 +845,7 @@ function admin_page_site_post(App &$a) {
* @param App $a
* @return string
*/
function admin_page_site(App &$a) {
function admin_page_site(App $a) {
/* Installed langs */
$lang_choices = get_available_languages();
@ -1072,7 +1072,7 @@ function admin_page_site(App &$a) {
* @param App $a
* @return string
**/
function admin_page_dbsync(App &$a) {
function admin_page_dbsync(App $a) {
$o = '';
@ -1155,7 +1155,7 @@ function admin_page_dbsync(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());
$users = (x($_POST, 'user') ? $_POST['user'] : array());
$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
* @return string
*/
function admin_page_users(App &$a){
function admin_page_users(App $a) {
if($a->argc>2) {
$uid = $a->argv[3];
$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
* @return string
*/
function admin_page_plugins(App &$a){
function admin_page_plugins(App $a) {
/*
* Single plugin
@ -1669,7 +1669,7 @@ function rebuild_theme_table($themes) {
* @param App $a
* @return string
*/
function admin_page_themes(App &$a){
function admin_page_themes(App $a) {
$allowed_themes_str = get_config('system','allowed_themes');
$allowed_themes_raw = explode(',',$allowed_themes_str);
@ -1749,7 +1749,7 @@ function admin_page_themes(App &$a){
$admin_form="";
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_page = $a->page;
$orig_session_theme = $_SESSION['theme'];
@ -1850,7 +1850,7 @@ function admin_page_themes(App &$a){
*
* @param App $a
*/
function admin_page_logs_post(App &$a) {
function admin_page_logs_post(App $a) {
if (x($_POST,"page_logs")) {
check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
@ -1884,7 +1884,7 @@ function admin_page_logs_post(App &$a) {
* @param App $a
* @return string
*/
function admin_page_logs(App &$a){
function admin_page_logs(App $a) {
$log_choices = array(
LOGGER_NORMAL => 'Normal',
@ -1941,7 +1941,7 @@ function admin_page_logs(App &$a){
* @param App $a
* @return string
*/
function admin_page_viewlogs(App &$a){
function admin_page_viewlogs(App $a) {
$t = get_markup_template("admin_viewlogs.tpl");
$f = get_config('system','logfile');
$data = '';
@ -1983,7 +1983,7 @@ function admin_page_viewlogs(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');
@ -2029,7 +2029,7 @@ function admin_page_features_post(App &$a) {
* @param App $a
* @return string
*/
function admin_page_features(App &$a) {
function admin_page_features(App $a) {
if((argc() > 1) && (argv(1) === 'features')) {
$arr = array();

2
mod/allfriends.php
View file

@ -5,7 +5,7 @@ require_once('include/Contact.php');
require_once('include/contact_selectors.php');
require_once('mod/contacts.php');
function allfriends_content(App &$a) {
function allfriends_content(App $a) {
$o = '';
if (! local_user()) {

2
mod/amcd.php
View file

@ -1,6 +1,6 @@
<?php
function amcd_content(App &$a) {
function amcd_content(App $a) {
//header("Content-type: text/json");
echo <<< EOT
{

4
mod/api.php
View file

@ -20,7 +20,7 @@ function oauth_get_client($request){
return $r[0];
}
function api_post(App &$a) {
function api_post(App $a) {
if (! local_user()) {
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'){
/*
* api/oauth/authorize interact with the user. return a standard page

2
mod/apps.php
View file

@ -1,6 +1,6 @@
<?php
function apps_content(App &$a) {
function apps_content(App $a) {
$privateaddons = get_config('config','private_addons');
if ($privateaddons === "1") {
if((! (local_user()))) {

2
mod/attach.php
View file

@ -2,7 +2,7 @@
require_once('include/security.php');
function attach_init(App &$a) {
function attach_init(App $a) {
if($a->argc != 2) {
notice( t('Item not available.') . EOL);

2
mod/babel.php
View file

@ -9,7 +9,7 @@ function visible_lf($s) {
return str_replace("\n",'<br />', $s);
}
function babel_content(App &$a) {
function babel_content(App $a) {
$o .= '<h1>Babel Diagnostic</h1>';

4
mod/bookmarklet.php
View file

@ -3,11 +3,11 @@
require_once('include/conversation.php');
require_once('include/items.php');
function bookmarklet_init(App &$a) {
function bookmarklet_init(App $a) {
$_GET["mode"] = "minimal";
}
function bookmarklet_content(App &$a) {
function bookmarklet_content(App $a) {
if (!local_user()) {
$o = '<h2>'.t('Login').'</h2>';
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);

4
mod/cal.php
View file

@ -9,7 +9,7 @@
require_once('include/event.php');
require_once('include/redir.php');
function cal_init(App &$a) {
function cal_init(App $a) {
if($a->argc > 1)
auto_redir($a, $a->argv[1]);
@ -64,7 +64,7 @@ function cal_init(App &$a) {
return;
}
function cal_content(App &$a) {
function cal_content(App $a) {
nav_set_selected('events');
$editselect = 'none';

8
mod/cb.php
View file

@ -5,19 +5,19 @@
*/
function cb_init(App &$a) {
function cb_init(App $a) {
call_hooks('cb_init');
}
function cb_post(App &$a) {
function cb_post(App $a) {
call_hooks('cb_post', $_POST);
}
function cb_afterpost(App &$a) {
function cb_afterpost(App $a) {
call_hooks('cb_afterpost');
}
function cb_content(App &$a) {
function cb_content(App $a) {
$o = '';
call_hooks('cb_content', $o);
return $o;

2
mod/common.php
View file

@ -5,7 +5,7 @@ require_once('include/Contact.php');
require_once('include/contact_selectors.php');
require_once('mod/contacts.php');
function common_content(App &$a) {
function common_content(App $a) {
$o = '';

4
mod/community.php
View file

@ -1,6 +1,6 @@
<?php
function community_init(App &$a) {
function community_init(App $a) {
if (! local_user()) {
unset($_SESSION['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 = '';

2
mod/contactgroup.php
View file

@ -2,7 +2,7 @@
require_once('include/group.php');
function contactgroup_content(App &$a) {
function contactgroup_content(App $a) {
if (! local_user()) {

8
mod/contacts.php
View file

@ -7,7 +7,7 @@ require_once('include/Scrape.php');
require_once('mod/proxy.php');
require_once('include/Photo.php');
function contacts_init(App &$a) {
function contacts_init(App $a) {
if (! local_user()) {
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'];
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()) {
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;
$o = '';

4
mod/content.php
View file

@ -16,7 +16,7 @@
// 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');
@ -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('mod/proxy.php');

2
mod/credits.php
View file

@ -5,7 +5,7 @@
* addons repository will be listed though ATM)
*/
function credits_content (App &$a) {
function credits_content (App $a) {
/* fill the page with credits */
$f = fopen('util/credits.txt','r');
$names = fread($f, filesize('util/credits.txt'));

6
mod/crepair.php
View file

@ -2,7 +2,7 @@
require_once("include/contact_selectors.php");
require_once("mod/contacts.php");
function crepair_init(App &$a) {
function crepair_init(App $a) {
if (! local_user()) {
return;
}
@ -30,7 +30,7 @@ function crepair_init(App &$a) {
}
}
function crepair_post(App &$a) {
function crepair_post(App $a) {
if (! local_user()) {
return;
}
@ -96,7 +96,7 @@ function crepair_post(App &$a) {
function crepair_content(App &$a) {
function crepair_content(App $a) {
if (! local_user()) {
notice( t('Permission denied.') . EOL);

4
mod/delegate.php
View file

@ -1,12 +1,12 @@
<?php
require_once('mod/settings.php');
function delegate_init(App &$a) {
function delegate_init(App $a) {
return settings_init($a);
}
function delegate_content(App &$a) {
function delegate_content(App $a) {
if (! local_user()) {
notice( t('Permission denied.') . EOL);

2
mod/dfrn_confirm.php
View file

@ -22,7 +22,7 @@ require_once('include/enotify.php');
require_once('include/group.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)) {

4
mod/dfrn_notify.php
View file

@ -11,7 +11,7 @@ require_once('include/event.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);
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
$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')) {

6
mod/dfrn_poll.php
View file

@ -4,7 +4,7 @@ require_once('include/auth.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'] : '');
@ -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'] : '');
$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'] : '');
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data');

6
mod/dfrn_request.php
View file

@ -17,7 +17,7 @@ require_once('include/Scrape.php');
require_once('include/Probe.php');
require_once('include/group.php');
function dfrn_request_init(App &$a) {
function dfrn_request_init(App $a) {
if($a->argc > 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.
*
*/
function dfrn_request_post(App &$a) {
function dfrn_request_post(App $a) {
if(($a->argc != 2) || (! 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))) {
return "";

6
mod/directory.php
View file

@ -1,6 +1,6 @@
<?php
function directory_init(App &$a) {
function directory_init(App $a) {
$a->set_pager_itemspage(60);
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'))
$a->data['search'] = $_POST['search'];
}
function directory_content(App &$a) {
function directory_content(App $a) {
global $db;
require_once("mod/proxy.php");

4
mod/dirfind.php
View file

@ -5,7 +5,7 @@ require_once('include/Contact.php');
require_once('include/contact_selectors.php');
require_once('mod/contacts.php');
function dirfind_init(App &$a) {
function dirfind_init(App $a) {
if (! local_user()) {
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;
$discover_user = false;

4
mod/display.php
View file

@ -1,6 +1,6 @@
<?php
function display_init(App &$a) {
function display_init(App $a) {
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return;
@ -194,7 +194,7 @@ function display_fetchauthor($a, $item) {
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())) {
notice(t('Public access denied.') . EOL);

2
mod/editpost.php
View file

@ -2,7 +2,7 @@
require_once('include/acl_selectors.php');
function editpost_content(App &$a) {
function editpost_content(App $a) {
$o = '';

6
mod/events.php
View file

@ -8,7 +8,7 @@ require_once('include/datetime.php');
require_once('include/event.php');
require_once('include/items.php');
function events_init(App &$a) {
function events_init(App $a) {
if (! local_user()) {
return;
}
@ -31,7 +31,7 @@ function events_init(App &$a) {
return;
}
function events_post(App &$a) {
function events_post(App $a) {
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()) {
notice( t('Permission denied.') . EOL);

2
mod/fbrowser.php
View file

@ -10,7 +10,7 @@ require_once('include/Photo.php');
/**
* @param App $a
*/
function fbrowser_content(App &$a){
function fbrowser_content(App $a) {
if (!local_user())
killme();

4
mod/fetch.php
View file

@ -6,9 +6,7 @@ require_once("include/crypto.php");
require_once("include/diaspora.php");
require_once("include/xml.php");
/// @TODO You always make it like this: function foo(&$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){
function fetch_init(App $a) {
if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));

2
mod/filer.php
View file

@ -5,7 +5,7 @@ require_once('include/bbcode.php');
require_once('include/items.php');
function filer_content(App &$a) {
function filer_content(App $a) {
if (! local_user()) {
killme();

2
mod/filerm.php
View file

@ -1,6 +1,6 @@
<?php
function filerm_content(App &$a) {
function filerm_content(App $a) {
if (! local_user()) {
killme();

4
mod/follow.php
View file

@ -5,7 +5,7 @@ require_once('include/follow.php');
require_once('include/Contact.php');
require_once('include/contact_selectors.php');
function follow_content(App &$a) {
function follow_content(App $a) {
if (! local_user()) {
notice( t('Permission denied.') . EOL);
@ -152,7 +152,7 @@ function follow_content(App &$a) {
return $o;
}
function follow_post(App &$a) {
function follow_post(App $a) {
if (! local_user()) {
notice( t('Permission denied.') . EOL);

4
mod/friendica.php
View file

@ -1,6 +1,6 @@
<?php
function friendica_init(App &$a) {
function friendica_init(App $a) {
if ($a->argv[1]=="json"){
$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 .= '<h3>Friendica</h3>';

4
mod/fsuggest.php
View file

@ -1,7 +1,7 @@
<?php
function fsuggest_post(App &$a) {
function fsuggest_post(App $a) {
if (! local_user()) {
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');

6
mod/group.php
View file

@ -4,7 +4,7 @@ function validate_members(&$item) {
$item = intval($item);
}
function group_init(App &$a) {
function group_init(App $a) {
if(local_user()) {
require_once('include/group.php');
$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()) {
notice( t('Permission denied.') . EOL);
@ -69,7 +69,7 @@ function group_post(App &$a) {
return;
}
function group_content(App &$a) {
function group_content(App $a) {
$change = false;
if (! local_user()) {

2
mod/hcard.php
View file

@ -1,6 +1,6 @@
<?php
function hcard_init(App &$a) {
function hcard_init(App $a) {
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);

2
mod/help.php
View file

@ -18,7 +18,7 @@ if (!function_exists('load_doc_file')) {
}
function help_content(App &$a) {
function help_content(App $a) {
nav_set_selected('help');

4
mod/home.php
View file

@ -1,7 +1,7 @@
<?php
if(! function_exists('home_init')) {
function home_init(App &$a) {
function home_init(App $a) {
$ret = array();
call_hooks('home_init',$ret);
@ -17,7 +17,7 @@ function home_init(App &$a) {
}}
if(! function_exists('home_content')) {
function home_content(App &$a) {
function home_content(App $a) {
$o = '';

2
mod/hostxrd.php
View file

@ -2,7 +2,7 @@
require_once('include/crypto.php');
function hostxrd_init(App &$a) {
function hostxrd_init(App $a) {
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");
$pubkey = get_config('system','site_pubkey');