diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_confirm.php | 1 | ||||
| -rw-r--r-- | mod/home.php | 4 | ||||
| -rw-r--r-- | mod/profile.php | 12 | ||||
| -rw-r--r-- | mod/settings.php | 17 |
4 files changed, 27 insertions, 7 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 6b9bbfe13..41e0771af 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -432,6 +432,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $contact['url'] . '" />' . "\n"); $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $contact['thumb'] . '" />' . "\n"); $arr['object'] .= '</link></object>' . "\n"; + $arr['last-child'] = 1; $i = item_store($arr); diff --git a/mod/home.php b/mod/home.php index 59cc31d3b..53b111bdf 100644 --- a/mod/home.php +++ b/mod/home.php @@ -19,7 +19,7 @@ function home_content(&$a) { * $a->page['footer'] = ''; * $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>"; */ - $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>'; + $o .= '<h1>' . ((x($a->config,'sitename')) ? t("Welcome to ").$a->config['sitename'] : "" ) . '</h1>'; if(file_exists('home.html')) $o .= file_get_contents('home.html'); @@ -27,4 +27,4 @@ function home_content(&$a) { return $o; -}}
\ No newline at end of file +}} diff --git a/mod/profile.php b/mod/profile.php index b1f020930..ffc412805 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -18,13 +18,19 @@ function profile_init(&$a) { profile_load($a,$which,$profile); + if(x($a->profile,'openidserver')) + $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n"; + 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"; + } + $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ; $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ; $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n"; header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); - - + $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); foreach($dfrn_pages as $dfrn) $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n"; @@ -365,4 +371,4 @@ function profile_content(&$a, $update = 0) { $o .= paginate($a); return $o; -}
\ No newline at end of file +} diff --git a/mod/settings.php b/mod/settings.php index 4743ecd66..6eaa17ad0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -109,7 +109,17 @@ function settings_post(&$a) { $str_group_deny = perms2str($_POST['group_deny']); $str_contact_deny = perms2str($_POST['contact_deny']); - $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d WHERE `uid` = %d LIMIT 1", + $openidserver = $a->user['openidserver']; + + if($openid != $a->user['openid']) { + logger('updating openidserver'); + require_once('library/openid.php'); + $open_id_obj = new LightOpenID; + $open_id_obj->identity = $openid; + $openidserver = $open_id_obj->discover($open_id_obj->identity); + } + + $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `openidserver` = '%s' WHERE `uid` = %d LIMIT 1", dbesc($username), dbesc($email), dbesc($openid), @@ -124,6 +134,7 @@ function settings_post(&$a) { intval($allow_location), dbesc($theme), intval($maxreq), + dbesc($openidserver), intval(local_user()) ); if($r) @@ -301,7 +312,9 @@ function settings_content(&$a) { '$pagetype' => $pagetype )); - call_hooks('settings_page',$o); + call_hooks('settings_form',$o); + + $o .= '</form>' . "\r\n"; return $o; |