Browse Source

Continued with coding convention:

- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
tags/3.5.1
Roland Haeder 3 years ago
parent
commit
6e44acfed6
No known key found for this signature in database GPG Key ID: B72F8185C6C7BD78
31 changed files with 173 additions and 127 deletions
  1. +1
    -1
      mod/admin.php
  2. +1
    -1
      mod/allfriends.php
  3. +1
    -1
      mod/cal.php
  4. +1
    -1
      mod/common.php
  5. +17
    -11
      mod/contacts.php
  6. +1
    -1
      mod/delegate.php
  7. +3
    -3
      mod/dfrn_request.php
  8. +5
    -3
      mod/directory.php
  9. +1
    -1
      mod/events.php
  10. +6
    -3
      mod/filerm.php
  11. +10
    -5
      mod/follow.php
  12. +1
    -1
      mod/group.php
  13. +13
    -10
      mod/hcard.php
  14. +8
    -5
      mod/install.php
  15. +9
    -7
      mod/invite.php
  16. +19
    -13
      mod/item.php
  17. +1
    -1
      mod/lostpass.php
  18. +2
    -2
      mod/message.php
  19. +10
    -10
      mod/network.php
  20. +1
    -1
      mod/nogroup.php
  21. +15
    -13
      mod/noscrape.php
  22. +23
    -13
      mod/openid.php
  23. +2
    -2
      mod/photos.php
  24. +1
    -1
      mod/poco.php
  25. +1
    -1
      mod/profile.php
  26. +1
    -1
      mod/profile_photo.php
  27. +11
    -9
      mod/profiles.php
  28. +1
    -1
      mod/search.php
  29. +1
    -1
      mod/suggest.php
  30. +2
    -2
      mod/videos.php
  31. +4
    -2
      mod/viewcontacts.php

+ 1
- 1
mod/admin.php View File

@@ -1122,7 +1122,7 @@ function admin_page_dbsync(App &$a) {
$failed = array();
$r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
$upd = intval(substr($rr['k'],7));
if($upd < 1139 || $rr['v'] === 'success')
continue;


+ 1
- 1
mod/allfriends.php View File

@@ -49,7 +49,7 @@ function allfriends_content(App &$a) {

$id = 0;

foreach($r as $rr) {
foreach ($r as $rr) {

//get further details of the contact
$contact_details = get_contact_details_by_url($rr['url'], $uid, $rr);


+ 1
- 1
mod/cal.php View File

@@ -229,7 +229,7 @@ function cal_content(App &$a) {

if (dbm::is_result($r)) {
$r = sort_by_date($r);
foreach($r as $rr) {
foreach ($r as $rr) {
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
if (! x($links,$j)) {
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;


+ 1
- 1
mod/common.php View File

@@ -101,7 +101,7 @@ function common_content(App &$a) {

$id = 0;

foreach($r as $rr) {
foreach ($r as $rr) {

//get further details of the contact
$contact_details = get_contact_details_by_url($rr['url'], $uid);


+ 17
- 11
mod/contacts.php View File

@@ -129,10 +129,12 @@ function contacts_batch_actions(App &$a){
info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
}

if(x($_SESSION,'return_url'))
if (x($_SESSION,'return_url')) {
goaway('' . $_SESSION['return_url']);
else
}
else {
goaway('contacts');
}

}

@@ -387,7 +389,7 @@ function contacts_content(App &$a) {

if($cmd === 'block') {
$r = _contact_block($contact_id, $orig_record[0]);
if($r) {
if ($r) {
$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
}
@@ -398,7 +400,7 @@ function contacts_content(App &$a) {

if($cmd === 'ignore') {
$r = _contact_ignore($contact_id, $orig_record[0]);
if($r) {
if ($r) {
$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
}
@@ -410,7 +412,7 @@ function contacts_content(App &$a) {

if($cmd === 'archive') {
$r = _contact_archive($contact_id, $orig_record[0]);
if($r) {
if ($r) {
$archived = (($orig_record[0]['archive']) ? 0 : 1);
info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
}
@@ -449,22 +451,26 @@ function contacts_content(App &$a) {
));
}
// Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) {
if(x($_SESSION,'return_url'))
if ($_REQUEST['canceled']) {
if (x($_SESSION,'return_url')) {
goaway('' . $_SESSION['return_url']);
else
}
else {
goaway('contacts');
}
}

_contact_drop($contact_id, $orig_record[0]);
info( t('Contact has been removed.') . EOL );
if(x($_SESSION,'return_url'))
if (x($_SESSION,'return_url')) {
goaway('' . $_SESSION['return_url']);
else
}
else {
goaway('contacts');
}
return; // NOTREACHED
}
if($cmd === 'posts') {
if ($cmd === 'posts') {
return contact_posts($a, $contact_id);
}
}


+ 1
- 1
mod/delegate.php View File

@@ -107,7 +107,7 @@ function delegate_content(App &$a) {
$nicknames = array();

if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
}
}


+ 3
- 3
mod/dfrn_request.php View File

@@ -178,7 +178,7 @@ function dfrn_request_post(App &$a) {
);
}

if($r) {
if ($r) {
info( t("Introduction complete.") . EOL);
}

@@ -301,7 +301,7 @@ function dfrn_request_post(App &$a) {
dbesc(NETWORK_MAIL2)
);
if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
if(! $rr['rel']) {
q("DELETE FROM `contact` WHERE `id` = %d",
intval($rr['cid'])
@@ -326,7 +326,7 @@ function dfrn_request_post(App &$a) {
dbesc(NETWORK_MAIL2)
);
if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
if(! $rr['rel']) {
q("DELETE FROM `contact` WHERE `id` = %d",
intval($rr['cid'])


+ 5
- 3
mod/directory.php View File

@@ -92,12 +92,14 @@ function directory_content(App &$a) {
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
if (dbm::is_result($r)) {

if(in_array('small', $a->argv))
if (in_array('small', $a->argv)) {
$photo = 'thumb';
else
}
else {
$photo = 'photo';
}

foreach($r as $rr) {
foreach ($r as $rr) {

$itemurl= '';



+ 1
- 1
mod/events.php View File

@@ -344,7 +344,7 @@ function events_content(App &$a) {

if (dbm::is_result($r)) {
$r = sort_by_date($r);
foreach($r as $rr) {
foreach ($r as $rr) {
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
if (! x($links,$j)) {
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;


+ 6
- 3
mod/filerm.php View File

@@ -10,18 +10,21 @@ function filerm_content(App &$a) {
$cat = unxmlify(trim($_GET['cat']));

$category = (($cat) ? true : false);
if($category)
if ($category) {
$term = $cat;
}

$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);

logger('filerm: tag ' . $term . ' item ' . $item_id);

if($item_id && strlen($term))
if ($item_id && strlen($term)) {
file_tag_unsave_file(local_user(),$item_id,$term, $category);
}

if(x($_SESSION,'return_url'))
if (x($_SESSION,'return_url')) {
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
}

killme();
}

+ 10
- 5
mod/follow.php View File

@@ -157,8 +157,9 @@ function follow_post(App &$a) {
// NOTREACHED
}

if ($_REQUEST['cancel'])
if ($_REQUEST['cancel']) {
goaway($_SESSION['return_url']);
}

$uid = local_user();
$url = notags(trim($_REQUEST['url']));
@@ -170,17 +171,21 @@ function follow_post(App &$a) {

$result = new_contact($uid,$url,true);

if($result['success'] == false) {
if($result['message'])
if ($result['success'] == false) {
if ($result['message']) {
notice($result['message']);
}
goaway($return_url);
} elseif ($result['cid'])
}
elseif ($result['cid']) {
goaway(App::get_baseurl().'/contacts/'.$result['cid']);
}

info( t('Contact added').EOL);

if(strstr($return_url,'contacts'))
if (strstr($return_url,'contacts')) {
goaway(App::get_baseurl().'/contacts/'.$contact_id);
}

goaway($return_url);
// NOTREACHED


+ 1
- 1
mod/group.php View File

@@ -25,7 +25,7 @@ function group_post(App &$a) {

$name = notags(trim($_POST['groupname']));
$r = group_add(local_user(),$name);
if($r) {
if ($r) {
info( t('Group created.') . EOL );
$r = group_byname(local_user(),$name);
if ($r) {


+ 13
- 10
mod/hcard.php View File

@@ -4,8 +4,9 @@ function hcard_init(App &$a) {

$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);

if($a->argc > 1)
if ($a->argc > 1) {
$which = $a->argv[1];
}
else {
notice( t('No profile') . EOL );
$a->error = 404;
@@ -13,28 +14,30 @@ function hcard_init(App &$a) {
}

$profile = 0;
if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
$which = $a->user['nickname'];
$profile = $a->argv[1];
if ((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
$which = $a->user['nickname'];
$profile = $a->argv[1];
}

profile_load($a,$which,$profile);

if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
if ((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
}
if(x($a->profile,'openidserver'))
if (x($a->profile,'openidserver')) {
$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
if(x($a->profile,'openid')) {
}
if (x($a->profile,'openid')) {
$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
}

if(! $blocked) {
if (! $blocked) {
$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
$keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
if(strlen($keywords))
if (strlen($keywords)) {
$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
}
}

$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
@@ -44,7 +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');
foreach($dfrn_pages as $dfrn) {
foreach ($dfrn_pages as $dfrn) {
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
}



+ 8
- 5
mod/install.php View File

@@ -52,7 +52,7 @@ function install_post(App &$a) {
$r = q("CREATE DATABASE '%s'",
dbesc($dbdata)
);
if($r) {
if ($r) {
unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
} else {
@@ -520,19 +520,22 @@ function check_smarty3(&$checks) {
function check_htaccess(&$checks) {
$status = true;
$help = "";
if (function_exists('curl_init')){
if (function_exists('curl_init')) {
$test = fetch_url(App::get_baseurl()."/install/testrewrite");

if ($test!="ok")
if ($test!="ok") {
$test = fetch_url(normalise_link(App::get_baseurl()."/install/testrewrite"));
}

if ($test!="ok") {
$status = false;
$help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
}
check_add($checks, t('Url rewrite is working'), $status, true, $help);
} else {
}
else {
// cannot check modrewrite if libcurl is not installed
/// @TODO Maybe issue warning here?
}
}

@@ -549,7 +552,7 @@ function check_imagik(&$checks) {
}
if ($imagick == false) {
check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, "");
}
}
else {
check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
if ($imagick) {


+ 9
- 7
mod/invite.php View File

@@ -116,11 +116,13 @@ function invite_content(App &$a) {

$dirloc = get_config('system','directory');
if(strlen($dirloc)) {
if($a->config['register_policy'] == REGISTER_CLOSED)
if ($a->config['register_policy'] == REGISTER_CLOSED) {
$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo');
elseif($a->config['register_policy'] != REGISTER_CLOSED)
}
elseif($a->config['register_policy'] != REGISTER_CLOSED) {
$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl())
. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo');
}
}
else {
$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
@@ -129,15 +131,15 @@ function invite_content(App &$a) {

$o = replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("send_invite"),
'$invite' => t('Send invitations'),
'$addr_text' => t('Enter email addresses, one per line:'),
'$msg_text' => t('Your message:'),
'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
'$invite' => t('Send invitations'),
'$addr_text' => t('Enter email addresses, one per line:'),
'$msg_text' => t('Your message:'),
'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
. $linktxt
. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . App::get_baseurl() . '/profile/' . $a->user['nickname']
. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n" ,
'$submit' => t('Submit')
'$submit' => t('Submit')
));

return $o;


+ 19
- 13
mod/item.php View File

@@ -59,13 +59,14 @@ function item_post(App &$a) {
// Check for doubly-submitted posts, and reject duplicates
// Note that we have to ignore previews, otherwise nothing will post
// after it's been previewed
if(!$preview && x($_REQUEST['post_id_random'])) {
if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
if (!$preview && x($_REQUEST['post_id_random'])) {
if (x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
logger("item post: duplicate post", LOGGER_DEBUG);
item_post_return(App::get_baseurl(), $api_source, $return_path);
}
else
else {
$_SESSION['post-random'] = $_REQUEST['post_id_random'];
}
}

/**
@@ -82,18 +83,20 @@ function item_post(App &$a) {
$r = false;
$objecttype = null;

if($parent || $parent_uri) {
if ($parent || $parent_uri) {

$objecttype = ACTIVITY_OBJ_COMMENT;

if(! x($_REQUEST,'type'))
if (! x($_REQUEST,'type')) {
$_REQUEST['type'] = 'net-comment';
}

if($parent) {
if ($parent) {
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
intval($parent)
);
} elseif($parent_uri && local_user()) {
}
elseif ($parent_uri && local_user()) {
// This is coming from an API source, and we are logged in
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($parent_uri),
@@ -105,7 +108,7 @@ function item_post(App &$a) {
if (dbm::is_result($r)) {
$parid = $r[0]['parent'];
$parent_uri = $r[0]['uri'];
if($r[0]['id'] != $r[0]['parent']) {
if ($r[0]['id'] != $r[0]['parent']) {
$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
intval($parid)
);
@@ -114,8 +117,9 @@ function item_post(App &$a) {

if (! dbm::is_result($r)) {
notice( t('Unable to locate original post.') . EOL);
if(x($_REQUEST,'return'))
if (x($_REQUEST,'return')) {
goaway($return_path);
}
killme();
}
$parent_item = $r[0];
@@ -125,7 +129,7 @@ function item_post(App &$a) {
//if(($parid) && ($parid != $parent))
$thr_parent = $parent_uri;

if($parent_item['contact-id'] && $uid) {
if ($parent_item['contact-id'] && $uid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($parent_item['contact-id']),
intval($uid)
@@ -449,13 +453,15 @@ function item_post(App &$a) {

$objecttype = ACTIVITY_OBJ_IMAGE;

foreach($images as $image) {
if(! stristr($image,App::get_baseurl() . '/photo/'))
foreach ($images as $image) {
if (! stristr($image,App::get_baseurl() . '/photo/')) {
continue;
}
$image_uri = substr($image,strrpos($image,'/') + 1);
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if(! strlen($image_uri))
if (! strlen($image_uri)) {
continue;
}
$srch = '<' . intval($contact_id) . '>';

$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''


+ 1
- 1
mod/lostpass.php View File

@@ -102,7 +102,7 @@ function lostpass_content(App &$a) {
dbesc($new_password_encoded),
intval($uid)
);
if($r) {
if ($r) {
$tpl = get_markup_template('pwdreset.tpl');
$o .= replace_macros($tpl,array(
'$lbl1' => t('Password Reset'),


+ 2
- 2
mod/message.php View File

@@ -160,7 +160,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
$newbody = $newbody . $origbody;

$cnt = 0;
foreach($images as $image) {
foreach ($images as $image) {
// We're depending on the property of 'foreach' (specified on the PHP website) that
// it loops over the array starting from the first element and going sequentially
// to the last element
@@ -231,7 +231,7 @@ function message_content(App &$a) {
intval($a->argv[2]),
intval(local_user())
);
if($r) {
if ($r) {
info( t('Message deleted.') . EOL );
}
//goaway(App::get_baseurl(true) . '/message' );


+ 10
- 10
mod/network.php View File

@@ -183,13 +183,13 @@ function saved_searches($search) {
$saved = array();

if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
$saved[] = array(
'id' => $rr['id'],
'term' => $rr['term'],
'encodedterm' => urlencode($rr['term']),
'delete' => t('Remove term'),
'selected' => ($search==$rr['term']),
'id' => $rr['id'],
'term' => $rr['term'],
'encodedterm' => urlencode($rr['term']),
'delete' => t('Remove term'),
'selected' => ($search==$rr['term']),
);
}
}
@@ -197,10 +197,10 @@ function saved_searches($search) {

$tpl = get_markup_template("saved_searches_aside.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Saved Searches'),
'$add' => t('add'),
'$searchbox' => search($search,'netsearch-box',$srchurl,true),
'$saved' => $saved,
'$title' => t('Saved Searches'),
'$add' => t('add'),
'$searchbox' => search($search,'netsearch-box',$srchurl,true),
'$saved' => $saved,
));

return $o;


+ 1
- 1
mod/nogroup.php View File

@@ -35,7 +35,7 @@ function nogroup_content(App &$a) {
}
$r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {

$contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr);



+ 15
- 13
mod/noscrape.php View File

@@ -31,21 +31,22 @@ function noscrape_init(App &$a) {
intval($a->profile['uid']));

$json_info = array(
'fn' => $a->profile['name'],
'addr' => $a->profile['addr'],
'nick' => $which,
'key' => $a->profile['pubkey'],
'fn' => $a->profile['name'],
'addr' => $a->profile['addr'],
'nick' => $which,
'key' => $a->profile['pubkey'],
'homepage' => App::get_baseurl()."/profile/{$which}",
'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
'photo' => $r[0]["photo"],
'tags' => $keywords
'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
'photo' => $r[0]["photo"],
'tags' => $keywords
);

if(is_array($a->profile) AND !$a->profile['hide-friends']) {
if (is_array($a->profile) AND !$a->profile['hide-friends']) {
$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
intval($a->profile['uid']));
if (dbm::is_result($r))
if (dbm::is_result($r)) {
$json_info["updated"] = date("c", strtotime($r[0]['updated']));
}

$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
AND `network` IN ('%s', '%s', '%s', '')",
@@ -54,20 +55,21 @@ function noscrape_init(App &$a) {
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS)
);
if (dbm::is_result($r))
if (dbm::is_result($r)) {
$json_info["contacts"] = intval($r[0]['total']);
}
}

//These are optional fields.
$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
foreach($profile_fields as $field) {
if(!empty($a->profile[$field])) {
foreach ($profile_fields as $field) {
if (!empty($a->profile[$field])) {
$json_info["$field"] = $a->profile[$field];
}
}

$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn) {
foreach ($dfrn_pages as $dfrn) {
$json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
}



+ 23
- 13
mod/openid.php View File

@@ -56,7 +56,7 @@ function openid_content(App &$a) {
// Successful OpenID login - but we can't match it to an existing account.
// New registration?

if($a->config['register_policy'] == REGISTER_CLOSED) {
if ($a->config['register_policy'] == REGISTER_CLOSED) {
notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
goaway(z_root());
}
@@ -64,31 +64,41 @@ function openid_content(App &$a) {
unset($_SESSION['register']);
$args = '';
$attr = $openid->getAttributes();
if(is_array($attr) && count($attr)) {
foreach($attr as $k => $v) {
if($k === 'namePerson/friendly')
if (is_array($attr) && count($attr)) {
foreach ($attr as $k => $v) {
if ($k === 'namePerson/friendly') {
$nick = notags(trim($v));
if($k === 'namePerson/first')
}
if($k === 'namePerson/first') {
$first = notags(trim($v));
if($k === 'namePerson')
}
if($k === 'namePerson') {
$args .= '&username=' . notags(trim($v));
if($k === 'contact/email')
}
if ($k === 'contact/email') {
$args .= '&email=' . notags(trim($v));
if($k === 'media/image/aspect11')
}
if ($k === 'media/image/aspect11') {
$photosq = bin2hex(trim($v));
if($k === 'media/image/default')
}
if ($k === 'media/image/default') {
$photo = bin2hex(trim($v));
}
}
}
if($nick)
if ($nick) {
$args .= '&nickname=' . $nick;
elseif($first)
}
elseif ($first) {
$args .= '&nickname=' . $first;
}

if($photosq)
if ($photosq) {
$args .= '&photo=' . $photosq;
elseif($photo)
}
elseif ($photo) {
$args .= '&photo=' . $photo;
}

$args .= '&openid_url=' . notags(trim($authid));



+ 2
- 2
mod/photos.php View File

@@ -255,7 +255,7 @@ function photos_post(App &$a) {
);
}
if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
$res[] = "'" . dbesc($rr['rid']) . "'" ;
}
} else {
@@ -277,7 +277,7 @@ function photos_post(App &$a) {
intval($page_owner_uid)
);
if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc($rr['parent-uri']),


+ 1
- 1
mod/poco.php View File

@@ -175,7 +175,7 @@ function poco_init(App &$a) {

if(is_array($r)) {
if (dbm::is_result($r)) {
foreach($r as $rr) {
foreach ($r as $rr) {
if (!isset($rr['generation'])) {
if ($global)
$rr['generation'] = 3;


+ 1
- 1
mod/profile.php View File

@@ -62,7 +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');
foreach($dfrn_pages as $dfrn) {
foreach ($dfrn_pages as $dfrn) {
$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";


+ 1
- 1
mod/profile_photo.php View File

@@ -204,7 +204,7 @@ function profile_photo_content(App &$a) {
return;
}
$havescale = false;
foreach($r as $rr) {
foreach ($r as $rr) {
if($rr['scale'] == 5)
$havescale = true;
}


+ 11
- 9
mod/profiles.php View File

@@ -780,24 +780,26 @@ function profiles_content(App &$a) {
if (dbm::is_result($r)) {

$tpl = get_markup_template('profile_entry.tpl');
foreach($r as $rr) {

$profiles = '';
foreach ($r as $rr) {
$profiles .= replace_macros($tpl, array(
'$photo' => $a->remove_baseurl($rr['thumb']),
'$id' => $rr['id'],
'$alt' => t('Profile Image'),
'$photo' => $a->remove_baseurl($rr['thumb']),
'$id' => $rr['id'],
'$alt' => t('Profile Image'),
'$profile_name' => $rr['profile-name'],
'$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>'
'$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>'
: '<a href="'.'profperm/'.$rr['id'].'" />' . t('Edit visibility') . '</a>')
));
}

$tpl_header = get_markup_template('profile_listing_header.tpl');
$o .= replace_macros($tpl_header,array(
'$header' => t('Edit/Manage Profiles'),
'$chg_photo' => t('Change profile photo'),
'$cr_new' => t('Create New Profile'),
'$header' => t('Edit/Manage Profiles'),
'$chg_photo' => t('Change profile photo'),
'$cr_new' => t('Create New Profile'),
'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
'$profiles' => $profiles
'$profiles' => $profiles
));
}
return $o;


+ 1
- 1
mod/search.php View File

@@ -17,7 +17,7 @@ function search_saved_searches() {

if (dbm::is_result($r)) {
$saved = array();
foreach($r as $rr) {
foreach ($r as $rr) {
$saved[] = array(
'id' => $rr['id'],
'term' => $rr['term'],


+ 1
- 1
mod/suggest.php View File

@@ -75,7 +75,7 @@ function suggest_content(App &$a) {

require_once 'include/contact_selectors.php';

foreach($r as $rr) {
foreach ($r as $rr) {

$connlnk = App::get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
$ignlnk = App::get_baseurl() . '/suggest?ignore=' . $rr['id'];


+ 2
- 2
mod/videos.php View File

@@ -368,8 +368,8 @@ function videos_content(App &$a) {

$videos = array();
if (dbm::is_result($r)) {
foreach($r as $rr) {
if($a->theme['template_engine'] === 'internal') {
foreach ($r as $rr) {
if ($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']);
$name_e = template_escape($rr['album']);
}


+ 4
- 2
mod/viewcontacts.php View File

@@ -76,9 +76,11 @@ function viewcontacts_content(App &$a) {

$contacts = array();

foreach($r as $rr) {
if($rr['self'])
foreach ($r as $rr) {
/// @TODO This triggers an E_NOTICE if 'self' is not there
if ($rr['self']) {
continue;
}

$url = $rr['url'];



Loading…
Cancel
Save