Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: add IP address to failed login log message modified: include/text.php Stupid bug fixed cleanup after openid refactoring refactor openid logins/registrations modified: include/text.php deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png some openid fixes, use identity url from openid server and normalise it. support "no_smilies" ctrl + left|right cursor keys to prev/next photos add 'loggin_out' hook * master:
This commit is contained in:
commit
5642e9fa38
7
boot.php
7
boot.php
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '2.3.1285' );
|
define ( 'FRIENDICA_VERSION', '2.3.1286' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1132 );
|
define ( 'DB_UPDATE_VERSION', 1132 );
|
||||||
|
|
||||||
|
@ -713,15 +713,16 @@ function login($register = false, $hiddens=false) {
|
||||||
|
|
||||||
$noid = get_config('system','no_openid');
|
$noid = get_config('system','no_openid');
|
||||||
|
|
||||||
|
$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
|
||||||
|
|
||||||
if(local_user()) {
|
if(local_user()) {
|
||||||
$tpl = get_markup_template("logout.tpl");
|
$tpl = get_markup_template("logout.tpl");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$tpl = get_markup_template("login.tpl");
|
$tpl = get_markup_template("login.tpl");
|
||||||
|
$_SESSION['return_url'] = $a->query_string;
|
||||||
}
|
}
|
||||||
|
|
||||||
$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
|
|
||||||
|
|
||||||
$o .= replace_macros($tpl,array(
|
$o .= replace_macros($tpl,array(
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
|
||||||
if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
|
if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
|
||||||
|
|
||||||
// process logout request
|
// process logout request
|
||||||
|
call_hooks("logging_out");
|
||||||
nuke_session();
|
nuke_session();
|
||||||
info( t('Logged out.') . EOL);
|
info( t('Logged out.') . EOL);
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
|
@ -77,7 +77,7 @@ else {
|
||||||
|
|
||||||
$noid = get_config('system','no_openid');
|
$noid = get_config('system','no_openid');
|
||||||
|
|
||||||
$openid_url = trim( (strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
|
$openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
|
||||||
|
|
||||||
// validate_url alters the calling parameter
|
// validate_url alters the calling parameter
|
||||||
|
|
||||||
|
@ -99,32 +99,12 @@ else {
|
||||||
$openid->identity = $openid_url;
|
$openid->identity = $openid_url;
|
||||||
$_SESSION['openid'] = $openid_url;
|
$_SESSION['openid'] = $openid_url;
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$openid->returnUrl = $a->get_baseurl() . '/openid';
|
$openid->returnUrl = $a->get_baseurl(true) . '/openid';
|
||||||
|
goaway($openid->authUrl());
|
||||||
$r = q("SELECT `uid` FROM `user` WHERE `openid` = '%s' LIMIT 1",
|
// NOTREACHED
|
||||||
dbesc($openid_url)
|
|
||||||
);
|
|
||||||
if(count($r)) {
|
|
||||||
// existing account
|
|
||||||
goaway($openid->authUrl());
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if($a->config['register_policy'] == REGISTER_CLOSED) {
|
|
||||||
$a = get_app();
|
|
||||||
notice( t('Login failed.') . EOL);
|
|
||||||
goaway(z_root());
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
// new account
|
|
||||||
$_SESSION['register'] = 1;
|
|
||||||
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
|
||||||
$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
|
|
||||||
goaway($openid->authUrl());
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
|
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
|
||||||
|
|
||||||
$record = null;
|
$record = null;
|
||||||
|
@ -165,7 +145,7 @@ else {
|
||||||
}
|
}
|
||||||
|
|
||||||
if((! $record) || (! count($record))) {
|
if((! $record) || (! count($record))) {
|
||||||
logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])));
|
logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
|
||||||
notice( t('Login failed.') . EOL );
|
notice( t('Login failed.') . EOL );
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
}
|
}
|
||||||
|
|
|
@ -694,8 +694,13 @@ function linkify($s) {
|
||||||
|
|
||||||
if(! function_exists('smilies')) {
|
if(! function_exists('smilies')) {
|
||||||
function smilies($s, $sample = false) {
|
function smilies($s, $sample = false) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
|
if(intval(get_config('system','no_smilies'))
|
||||||
|
|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
|
||||||
|
return $s;
|
||||||
|
|
||||||
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
|
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
|
||||||
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
|
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
|
||||||
|
|
||||||
|
@ -704,27 +709,20 @@ function smilies($s, $sample = false) {
|
||||||
'</3',
|
'</3',
|
||||||
'<\\3',
|
'<\\3',
|
||||||
':-)',
|
':-)',
|
||||||
// ':)',
|
|
||||||
';-)',
|
';-)',
|
||||||
// ';)',
|
|
||||||
':-(',
|
':-(',
|
||||||
// ':(',
|
|
||||||
':-P',
|
':-P',
|
||||||
// ':P',
|
|
||||||
':-"',
|
':-"',
|
||||||
':-"',
|
':-"',
|
||||||
':-x',
|
':-x',
|
||||||
':-X',
|
':-X',
|
||||||
':-D',
|
':-D',
|
||||||
// ':D',
|
|
||||||
'8-|',
|
'8-|',
|
||||||
'8-O',
|
'8-O',
|
||||||
':-O',
|
':-O',
|
||||||
'\\o/',
|
'\\o/',
|
||||||
'o.O',
|
'o.O',
|
||||||
'O.o',
|
'O.o',
|
||||||
'\\.../',
|
|
||||||
'\\ooo/',
|
|
||||||
":'(",
|
":'(",
|
||||||
":-!",
|
":-!",
|
||||||
":-/",
|
":-/",
|
||||||
|
@ -734,12 +732,8 @@ function smilies($s, $sample = false) {
|
||||||
':homebrew',
|
':homebrew',
|
||||||
':coffee',
|
':coffee',
|
||||||
':facepalm',
|
':facepalm',
|
||||||
':headdesk',
|
|
||||||
'~friendika',
|
'~friendika',
|
||||||
'~friendica',
|
'~friendica'
|
||||||
// 'Diaspora*'
|
|
||||||
':beard',
|
|
||||||
':whitebeard'
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -748,27 +742,20 @@ function smilies($s, $sample = false) {
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
|
||||||
// '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
|
||||||
// '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";)"/>',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
|
||||||
// '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
|
||||||
// '<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":P" />',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
|
||||||
// '<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":D"/>',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
|
||||||
|
@ -778,12 +765,8 @@ function smilies($s, $sample = false) {
|
||||||
'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
|
'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
|
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
|
|
||||||
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
|
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
|
||||||
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
|
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
|
||||||
// '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-beard.png" alt=":beard" />',
|
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-whitebeard.png" alt=":whitebeard" />'
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
|
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
|
||||||
|
@ -1350,3 +1333,6 @@ function file_tag_unsave_file($uid,$item,$file) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalise_openid($s) {
|
||||||
|
return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
|
||||||
|
}
|
||||||
|
|
114
mod/openid.php
114
mod/openid.php
|
@ -10,68 +10,84 @@ function openid_content(&$a) {
|
||||||
if($noid)
|
if($noid)
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
|
|
||||||
|
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
|
||||||
|
|
||||||
if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
|
if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
|
||||||
|
|
||||||
$openid = new LightOpenID;
|
$openid = new LightOpenID;
|
||||||
|
|
||||||
if($openid->validate()) {
|
if($openid->validate()) {
|
||||||
|
|
||||||
if(x($_SESSION,'register')) {
|
$authid = normalise_openid($_REQUEST['openid_identity']);
|
||||||
unset($_SESSION['register']);
|
|
||||||
$args = '';
|
|
||||||
$attr = $openid->getAttributes();
|
|
||||||
if(is_array($attr) && count($attr)) {
|
|
||||||
foreach($attr as $k => $v) {
|
|
||||||
if($k === 'namePerson/friendly')
|
|
||||||
$nick = notags(trim($v));
|
|
||||||
if($k === 'namePerson/first')
|
|
||||||
$first = notags(trim($v));
|
|
||||||
if($k === 'namePerson')
|
|
||||||
$args .= '&username=' . notags(trim($v));
|
|
||||||
if($k === 'contact/email')
|
|
||||||
$args .= '&email=' . notags(trim($v));
|
|
||||||
if($k === 'media/image/aspect11')
|
|
||||||
$photosq = bin2hex(trim($v));
|
|
||||||
if($k === 'media/image/default')
|
|
||||||
$photo = bin2hex(trim($v));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if($nick)
|
|
||||||
$args .= '&nickname=' . $nick;
|
|
||||||
elseif($first)
|
|
||||||
$args .= '&nickname=' . $first;
|
|
||||||
|
|
||||||
if($photosq)
|
|
||||||
$args .= '&photo=' . $photosq;
|
|
||||||
elseif($photo)
|
|
||||||
$args .= '&photo=' . $photo;
|
|
||||||
|
|
||||||
$args .= '&openid_url=' . notags(trim($_SESSION['openid']));
|
|
||||||
if($a->config['register_policy'] != REGISTER_CLOSED)
|
|
||||||
goaway($a->get_baseurl() . '/register' . $args);
|
|
||||||
else
|
|
||||||
goaway(z_root());
|
|
||||||
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if(! strlen($authid)) {
|
||||||
|
logger( t('OpenID protocol error. No ID returned.') . EOL);
|
||||||
|
goaway(z_root());
|
||||||
|
}
|
||||||
|
|
||||||
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
|
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
|
||||||
FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
|
FROM `user` WHERE `openid` = '%s' AND `blocked` = 0
|
||||||
dbesc($_SESSION['openid'])
|
AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
|
||||||
|
dbesc($authid)
|
||||||
);
|
);
|
||||||
if(! count($r)) {
|
|
||||||
notice( t('Login failed.') . EOL );
|
if($r && count($r)) {
|
||||||
|
|
||||||
|
// successful OpenID login
|
||||||
|
|
||||||
|
unset($_SESSION['openid']);
|
||||||
|
|
||||||
|
require_once('include/security.php');
|
||||||
|
authenticate_success($r[0],true,true);
|
||||||
|
|
||||||
|
// just in case there was no return url set
|
||||||
|
// and we fell through
|
||||||
|
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
}
|
}
|
||||||
unset($_SESSION['openid']);
|
|
||||||
|
|
||||||
require_once('include/security.php');
|
// Successful OpenID login - but we can't match it to an existing account.
|
||||||
authenticate_success($r[0],true,true);
|
// New registration?
|
||||||
|
|
||||||
// just in case there was no return url set
|
if($a->config['register_policy'] == REGISTER_CLOSED) {
|
||||||
// and we fell through
|
notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
|
||||||
|
goaway(z_root());
|
||||||
|
}
|
||||||
|
|
||||||
goaway(z_root());
|
unset($_SESSION['register']);
|
||||||
|
$args = '';
|
||||||
|
$attr = $openid->getAttributes();
|
||||||
|
if(is_array($attr) && count($attr)) {
|
||||||
|
foreach($attr as $k => $v) {
|
||||||
|
if($k === 'namePerson/friendly')
|
||||||
|
$nick = notags(trim($v));
|
||||||
|
if($k === 'namePerson/first')
|
||||||
|
$first = notags(trim($v));
|
||||||
|
if($k === 'namePerson')
|
||||||
|
$args .= '&username=' . notags(trim($v));
|
||||||
|
if($k === 'contact/email')
|
||||||
|
$args .= '&email=' . notags(trim($v));
|
||||||
|
if($k === 'media/image/aspect11')
|
||||||
|
$photosq = bin2hex(trim($v));
|
||||||
|
if($k === 'media/image/default')
|
||||||
|
$photo = bin2hex(trim($v));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if($nick)
|
||||||
|
$args .= '&nickname=' . $nick;
|
||||||
|
elseif($first)
|
||||||
|
$args .= '&nickname=' . $first;
|
||||||
|
|
||||||
|
if($photosq)
|
||||||
|
$args .= '&photo=' . $photosq;
|
||||||
|
elseif($photo)
|
||||||
|
$args .= '&photo=' . $photo;
|
||||||
|
|
||||||
|
$args .= '&openid_url=' . notags(trim($authid));
|
||||||
|
|
||||||
|
goaway($a->get_baseurl() . '/register' . $args);
|
||||||
|
|
||||||
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
notice( t('Login failed.') . EOL);
|
notice( t('Login failed.') . EOL);
|
||||||
|
|
|
@ -1069,7 +1069,7 @@ function photos_content(&$a) {
|
||||||
if($can_post && ($ph[0]['uid'] == $owner_uid)) {
|
if($can_post && ($ph[0]['uid'] == $owner_uid)) {
|
||||||
$tools = array(
|
$tools = array(
|
||||||
'edit' => array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
|
'edit' => array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
|
||||||
'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'] . '?form_security_token=' . get_form_security_token('profile_photo'), t('Use as profile photo')),
|
'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
|
||||||
);
|
);
|
||||||
|
|
||||||
// lock
|
// lock
|
||||||
|
@ -1081,6 +1081,17 @@ function photos_content(&$a) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(! $cmd !== 'edit') {
|
||||||
|
$a->page['htmlhead'] .= '<script>
|
||||||
|
$(document).keydown(function(event) {' . "\n";
|
||||||
|
|
||||||
|
if($prevlink)
|
||||||
|
$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n";
|
||||||
|
if($nextlink)
|
||||||
|
$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n";
|
||||||
|
$a->page['htmlhead'] .= '});</script>';
|
||||||
|
}
|
||||||
|
|
||||||
if($prevlink)
|
if($prevlink)
|
||||||
$prevlink = array($prevlink, '<div class="icon prev"></div>') ;
|
$prevlink = array($prevlink, '<div class="icon prev"></div>') ;
|
||||||
|
|
||||||
|
|
|
@ -322,6 +322,7 @@ function settings_post(&$a) {
|
||||||
$str_contact_deny = perms2str($_POST['contact_deny']);
|
$str_contact_deny = perms2str($_POST['contact_deny']);
|
||||||
|
|
||||||
$openidserver = $a->user['openidserver'];
|
$openidserver = $a->user['openidserver'];
|
||||||
|
$openid = normalise_openid($openid);
|
||||||
|
|
||||||
// If openid has changed or if there's an openid but no openidserver, try and discover it.
|
// If openid has changed or if there's an openid but no openidserver, try and discover it.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue