From: Roland Häder Date: Tue, 20 Dec 2016 09:58:55 +0000 (+0100) Subject: changed to this: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9fad8109ffafa689ff5b230906d21dec18cd8725;p=friendica.git changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } --------------------- Signed-off-by: Roland Häder --- diff --git a/mod/admin.php b/mod/admin.php index 48320fb36c..e1ccf67caf 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1156,21 +1156,21 @@ function admin_page_dbsync(App &$a) { * @param 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'] : ''); - $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); - $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $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'] : ''); + $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); + $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); $nu_language = get_config('system', 'language'); check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); - if(!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { + if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { require_once('include/user.php'); $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1, 'language'=>$nu_language)); - if(! $result['success']) { + if (! $result['success']) { notice($result['message']); return; } diff --git a/mod/contacts.php b/mod/contacts.php index f709f9d2fb..26dfe06078 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -28,19 +28,22 @@ function contacts_init(App &$a) { require_once('include/group.php'); require_once('include/contact_widgets.php'); - if ($_GET['nets'] == "all") - $_GET['nets'] = ""; + if ($_GET['nets'] == "all") { + $_GET['nets'] = ""; + } - if(! x($a->page,'aside')) + if (! x($a->page,'aside')) { $a->page['aside'] = ''; + } - if($contact_id) { + if ($contact_id) { $a->data['contact'] = $r[0]; if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); - } else + } else { $networkname = ''; + } $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( '$name' => htmlentities($a->data['contact']['name']), diff --git a/mod/hcard.php b/mod/hcard.php index 8d79dd0546..d53405009a 100644 --- a/mod/hcard.php +++ b/mod/hcard.php @@ -47,11 +47,7 @@ function hcard_init(App &$a) { header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); -<<<<<<< upstream/develop foreach ($dfrn_pages as $dfrn) { -======= - foreach($dfrn_pages as $dfrn) { ->>>>>>> HEAD~65 $a->page['htmlhead'] .= "\r\n"; } diff --git a/mod/network.php b/mod/network.php index f433277076..61df38fb12 100644 --- a/mod/network.php +++ b/mod/network.php @@ -25,7 +25,6 @@ function network_init(App &$a) { parse_str($query_string, $query_array); array_shift($query_array); - // fetch last used network view and redirect if needed if (! $is_a_date_query) { $sel_tabs = network_query_get_sel_tab($a); @@ -42,10 +41,9 @@ function network_init(App &$a) { $net_baseurl = '/network'; $net_args = array(); - if($remember_group) { + if ($remember_group) { $net_baseurl .= '/' . $last_sel_groups; // Note that the group number must come before the "/new" tab selection - } - else if($sel_groups !== false) { + } elseif($sel_groups !== false) { $net_baseurl .= '/' . $sel_groups; } diff --git a/mod/notify.php b/mod/notify.php index 2d34821ded..2696afaada 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -1,12 +1,10 @@ argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { diff --git a/mod/profile.php b/mod/profile.php index 28b508dc0e..8519f7e82e 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -62,11 +62,7 @@ function profile_init(App &$a) { header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); -<<<<<<< upstream/develop foreach ($dfrn_pages as $dfrn) { -======= - foreach($dfrn_pages as $dfrn) { ->>>>>>> HEAD~65 $a->page['htmlhead'] .= "\r\n"; } $a->page['htmlhead'] .= "\r\n"; diff --git a/mod/suggest.php b/mod/suggest.php index 6ded66286a..a6c4b6e568 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -3,7 +3,6 @@ require_once('include/socgraph.php'); require_once('include/contact_widgets.php'); - function suggest_init(App &$a) { if (! local_user()) { return; diff --git a/mod/uexport.php b/mod/uexport.php index 7aa9724d58..1ca046d224 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -9,6 +9,7 @@ function uexport_init(App &$a){ settings_init($a); } +/// @TODO Change space -> tab where wanted function uexport_content(App &$a){ if ($a->argc > 1) {