Kaynağa Gözat

changed to this:

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

Signed-off-by: Roland Häder <roland@mxchange.org>
tags/3.5.1
Roland Häder 3 yıl önce
committed by Roland Haeder
ebeveyn
işleme
9fad8109ff
Veri tabanında bu imza için bilinen anahtar bulunamadı GPG Anahtar Kimliği: B72F8185C6C7BD78
8 değiştirilmiş dosya ile 18 ekleme ve 27 silme
  1. +7
    -7
      mod/admin.php
  2. +8
    -5
      mod/contacts.php
  3. +0
    -4
      mod/hcard.php
  4. +2
    -4
      mod/network.php
  5. +0
    -2
      mod/notify.php
  6. +0
    -4
      mod/profile.php
  7. +0
    -1
      mod/suggest.php
  8. +1
    -0
      mod/uexport.php

+ 7
- 7
mod/admin.php Dosyayı Görüntüle

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


+ 8
- 5
mod/contacts.php Dosyayı Görüntüle

@@ -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']),


+ 0
- 4
mod/hcard.php Dosyayı Görüntüle

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



+ 2
- 4
mod/network.php Dosyayı Görüntüle

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



+ 0
- 2
mod/notify.php Dosyayı Görüntüle

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


+ 0
- 4
mod/profile.php Dosyayı Görüntüle

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


+ 0
- 1
mod/suggest.php Dosyayı Görüntüle

@@ -3,7 +3,6 @@
require_once('include/socgraph.php');
require_once('include/contact_widgets.php');


function suggest_init(App &$a) {
if (! local_user()) {
return;


+ 1
- 0
mod/uexport.php Dosyayı Görüntüle

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


Yükleniyor…
İptal
Kaydet