changed to this:

---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/mod/admin.php b/mod/admin.php
index 48320fb36cb20c8090d0c849c277bb568bd16156..e1ccf67caf001ad313cfcbf2678c98a41925d486 100644 (file)
--- 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 f709f9d2fb539716fae67fd40063cb72f528aab1..26dfe0607837afc4b58f1305b8688e5d3972d11e 100644 (file)
--- 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 8d79dd054634b8f9aab8fb71857fb0b2ba3ff9f5..d53405009a6fda34ebadaf3e447c605223c76134 100644 (file)
--- 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'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        }
 

diff --git a/mod/network.php b/mod/network.php
index f43327707671f27ff1847709cfb162fd2889393e..61df38fb12b69b4f2a75c2bf3dec1862b5a23b68 100644 (file)
--- 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 2d34821ded6898feaa9fe8300f72eaa9ae123836..2696afaada5aa842c87de22541d30ff931ad4a3a 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,12 +1,10 @@
 <?php
 require_once('include/NotificationsManager.php');
 
-
 function notify_init(App &$a) {
        if (! local_user()) {
                return;
        }
-
        $nm = new NotificationsManager();
 
        if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {

diff --git a/mod/profile.php b/mod/profile.php
index 28b508dc0e7b25ee0e9f90a4e6cf72041d022c05..8519f7e82ed616cbf06d618071a1816dcd663c77 100644 (file)
--- 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'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        }
        $a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";

diff --git a/mod/suggest.php b/mod/suggest.php
index 6ded66286aaec5d69289a21572bce4e3bc2005f0..a6c4b6e5680219e549e0391048b0190c8d2b7634 100644 (file)
--- 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 7aa9724d5893cd3a102070c3fd2de98b040844e7..1ca046d22498860c323d3b1fc587ebf4c0bd0ff4 100644 (file)
--- 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) {