clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3 

Normalize App parameter declaration (mod folder, 2 out of 3)
This commit is contained in:
Michael Vogel 2017-01-11 22:49:01 +01:00 committed by GitHub
parent 05a2989ecb f92918f471
commit 5eaa5951a1
42 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/hovercard.php
View File

@ -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";
} }

2
mod/ignored.php
View File

@ -1,7 +1,7 @@
<?php <?php
function ignored_init(App &$a) { function ignored_init(App $a) {
$ignored = 0; $ignored = 0;

8
mod/install.php
View File

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

4
mod/invite.php
View File

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

4
mod/item.php
View File

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

2
mod/like.php
View File

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

4
mod/localtime.php
View File

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

2
mod/lockview.php
View File

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

2
mod/login.php
View File

@ -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
mod/lostpass.php
View File

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

2
mod/maintenance.php
View File

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

4
mod/manage.php
View File

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

4
mod/match.php
View File

@ -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()) {

6
mod/message.php
View File

@ -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
mod/modexp.php
View File

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

4
mod/mood.php
View File

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

2
mod/msearch.php
View File

@ -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
mod/navigation.php
View File

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

10
mod/network.php
View File

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

2
mod/newmember.php
View File

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

4
mod/nodeinfo.php
View File

@ -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
mod/nogroup.php
View File

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

2
mod/noscrape.php
View File

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

4
mod/notes.php
View File

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

2
mod/notice.php
View File

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

4
mod/notifications.php
View File

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

4
mod/notify.php
View File

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

2
mod/oembed.php
View File

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

4
mod/oexchange.php
View File

@ -1,7 +1,7 @@
<?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');
@ -14,7 +14,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);

2
mod/openid.php
View File

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

2
mod/opensearch.php
View File

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

2
mod/ostatus_subscribe.php
View File

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

2
mod/parse_url.php
View File

@ -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 = "";

2
mod/photo.php
View File

@ -3,7 +3,7 @@
require_once('include/security.php'); require_once('include/security.php');
require_once('include/Photo.php'); require_once('include/Photo.php');
function photo_init(App &$a) { function photo_init(App $a) {
global $_SERVER; global $_SERVER;
$prvcachecontrol = false; $prvcachecontrol = false;

6
mod/photos.php
View File

@ -10,7 +10,7 @@ require_once('include/tags.php');
require_once('include/threads.php'); require_once('include/threads.php');
require_once('include/Probe.php'); require_once('include/Probe.php');
function photos_init(App &$a) { function photos_init(App $a) {
if ($a->argc > 1) if ($a->argc > 1)
auto_redir($a, $a->argv[1]); auto_redir($a, $a->argv[1]);
@ -112,7 +112,7 @@ function photos_init(App &$a) {
function photos_post(App &$a) { function photos_post(App $a) {
logger('mod-photos: photos_post: begin' , LOGGER_DEBUG); logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
@ -946,7 +946,7 @@ function photos_post(App &$a) {
function photos_content(App &$a) { function photos_content(App $a) {
// URLs: // URLs:
// photos/name // photos/name

2
mod/poco.php
View File

@ -2,7 +2,7 @@
// See here for a documentation for portable contacts: // See here for a documentation for portable contacts:
// https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
function poco_init(App &$a) { function poco_init(App $a) {
require_once("include/bbcode.php"); require_once("include/bbcode.php");
$system_mode = false; $system_mode = false;

4
mod/poke.php
View File

@ -19,7 +19,7 @@ require_once('include/bbcode.php');
require_once('include/items.php'); require_once('include/items.php');
function poke_init(App &$a) { function poke_init(App $a) {
if (! local_user()) { if (! local_user()) {
return; return;
@ -148,7 +148,7 @@ function poke_init(App &$a) {
function poke_content(App &$a) { function poke_content(App $a) {
if (! local_user()) { if (! local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);

2
mod/post.php
View File

@ -10,7 +10,7 @@ require_once('include/crypto.php');
// not yet ready for prime time // not yet ready for prime time
//require_once('include/zot.php'); //require_once('include/zot.php');
function post_post(App &$a) { function post_post(App $a) {
$bulk_delivery = false; $bulk_delivery = false;

2
mod/pretheme.php
View File

@ -1,6 +1,6 @@
<?php <?php
function pretheme_init(App &$a) { function pretheme_init(App $a) {
if($_REQUEST['theme']) { if($_REQUEST['theme']) {
$theme = $_REQUEST['theme']; $theme = $_REQUEST['theme'];

2
mod/probe.php
View File

@ -2,7 +2,7 @@
require_once('include/Scrape.php'); require_once('include/Scrape.php');
function probe_content(App &$a) { function probe_content(App $a) {
$o .= '<h3>Probe Diagnostic</h3>'; $o .= '<h3>Probe Diagnostic</h3>';

4
mod/profile.php
View File

@ -4,7 +4,7 @@ require_once('include/contact_widgets.php');
require_once('include/redir.php'); require_once('include/redir.php');
function profile_init(App &$a) { function profile_init(App $a) {
if(! x($a->page,'aside')) if(! x($a->page,'aside'))
$a->page['aside'] = ''; $a->page['aside'] = '';
@ -71,7 +71,7 @@ function profile_init(App &$a) {
} }
function profile_content(&$a, $update = 0) { function profile_content(App $a, $update = 0) {
$category = $datequery = $datequery2 = ''; $category = $datequery = $datequery2 = '';

8
mod/profile_photo.php
View File

@ -2,7 +2,7 @@
require_once("include/Photo.php"); require_once("include/Photo.php");
function profile_photo_init(App &$a) { function profile_photo_init(App $a) {
if (! local_user()) { if (! local_user()) {
return; return;
@ -13,7 +13,7 @@ function profile_photo_init(App &$a) {
} }
function profile_photo_post(App &$a) { function profile_photo_post(App $a) {
if (! local_user()) { if (! local_user()) {
notice ( t('Permission denied.') . EOL ); notice ( t('Permission denied.') . EOL );
@ -174,7 +174,7 @@ function profile_photo_post(App &$a) {
if(! function_exists('profile_photo_content')) { if(! function_exists('profile_photo_content')) {
function profile_photo_content(App &$a) { function profile_photo_content(App $a) {
if (! local_user()) { if (! local_user()) {
notice( t('Permission denied.') . EOL ); notice( t('Permission denied.') . EOL );
@ -284,7 +284,7 @@ function profile_photo_content(App &$a) {
if(! function_exists('profile_photo_crop_ui_head')) { if(! function_exists('profile_photo_crop_ui_head')) {
function profile_photo_crop_ui_head(&$a, $ph){ function profile_photo_crop_ui_head(App $a, $ph) {
$max_length = get_config('system','max_image_length'); $max_length = get_config('system','max_image_length');
if (! $max_length) { if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH; $max_length = MAX_IMAGE_LENGTH;